dect
/
linux-2.6
Archived
13
0
Fork 0

[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: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Paul Mundt 2005-11-07 00:58:20 -08:00 committed by Linus Torvalds
parent e87eaad107
commit 72777373b3
4 changed files with 0 additions and 55 deletions

View File

@ -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"

View File

@ -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

View File

@ -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)

View File

@ -1,9 +0,0 @@
OUTPUT_ARCH(sh)
SECTIONS
{
.initrd :
{
*(.data)
}
}