Commit 72777373 authored by Paul Mundt's avatar Paul Mundt Committed by Linus Torvalds
Browse files

[PATCH] sh: Drop deprecated support for custom ramdisk embedding 



sh had its own support for embedding ramdisk images in to the kernel binary,
but people are using initramfs for this now, so we drop the ramdisk embedding.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e87eaad1

arch/sh/Kconfig

+0 −18
Original line number Diff line number Diff line
@@ -770,24 +770,6 @@ source "fs/Kconfig.binfmt" 


endmenu



menu "SH initrd options"

	depends on BLK_DEV_INITRD



config EMBEDDED_RAMDISK

	bool "Embed root filesystem ramdisk into the kernel"



config EMBEDDED_RAMDISK_IMAGE

	string "Filename of gziped ramdisk image"

	depends on EMBEDDED_RAMDISK

	default "ramdisk.gz"

	help

	  This is the filename of the ramdisk image to be built into the

	  kernel.  Relative pathnames are relative to arch/sh/ramdisk/.

	  The ramdisk image is not part of the kernel distribution; you must

	  provide one yourself.



endmenu



source "net/Kconfig"



source "drivers/Kconfig"

arch/sh/Makefile

+0 −8
Original line number Diff line number Diff line
@@ -60,14 +60,6 @@ LIBGCC := $(shell $(CC) $(CFLAGS) -print-libgcc-file-name) 


core-y				+= arch/sh/kernel/ arch/sh/mm/



#

# ramdisk/initrd support

# You need a compressed ramdisk image, named

# CONFIG_EMBEDDED_RAMDISK_IMAGE. Relative pathnames

# are relative to arch/sh/ramdisk/.

#

core-$(CONFIG_EMBEDDED_RAMDISK)	+= arch/sh/ramdisk/



# Boards

machdir-$(CONFIG_SH_SOLUTION_ENGINE)		:= se/770x

machdir-$(CONFIG_SH_7751_SOLUTION_ENGINE)	:= se/7751

arch/sh/ramdisk/Makefile

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
#

# Makefile for a ramdisk image

#



obj-y += ramdisk.o





O_FORMAT = $(shell $(OBJDUMP) -i | head -n 2 | grep elf32)

img := $(subst ",,$(CONFIG_EMBEDDED_RAMDISK_IMAGE))

# add $(src) when $(img) is relative

img := $(subst $(src)//,/,$(src)/$(img))



quiet_cmd_ramdisk = LD      $@

define cmd_ramdisk

	$(LD) -T $(srctree)/$(src)/ld.script -b binary --oformat $(O_FORMAT) \

		-o $@ $(img)

endef



$(obj)/ramdisk.o: $(img) $(srctree)/$(src)/ld.script

	$(call cmd,ramdisk)

arch/sh/ramdisk/ld.script

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 
OUTPUT_ARCH(sh)

SECTIONS

{

  .initrd :

  {

       *(.data)

  }

}