sh: Drop deprecated support for custom ramdisk embedding.

PATCH In review Paul Mundt 1 participant 1 message Nov 2, 2005 SuperH

Share & tools

Paul Mundt

author

2005-11-02 22:30 UTC #0 lore raw

PATCH 2/7 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 Paul Mundt <[email protected]>

---

 arch/sh/Kconfig           |   18 ------------------
 arch/sh/Makefile          |    8 --------
 arch/sh/ramdisk/Makefile  |   20 --------------------
 arch/sh/ramdisk/ld.script |    9 ---------
 4 files changed, 0 insertions(+), 55 deletions(-)
 delete mode 100644 arch/sh/ramdisk/Makefile
 delete mode 100644 arch/sh/ramdisk/ld.script

applies-to: e55015f93ae413d03a2100c932978f510ef89284 dd7c534fe405434948818a6f27abfc8e35d26075

arch/sh/Kconfig +0 ~~-18~~

index 3e804c7..7d31d62 100644
@@ -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

index 4a30490..67192d6 100644
@@ -60,14 +60,6 @@ LIBGCC := $(shell $(CC) $(CFLAGS) -print
 
 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 deleted +0 ~~-20~~

deleted file mode 100644
index 99e1c68..0000000
@@ -1,20 +0,0 @@
-#
-# 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 deleted +0 -9

deleted file mode 100644
index 94beee2..0000000
@@ -1,9 +0,0 @@
-OUTPUT_ARCH(sh)
-SECTIONS
-{
-  .initrd :
-  {
-       *(.data)
-  }
-}
-

---
0.99.8.GIT