diff options
-rw-r--r-- | arch/sh/Kconfig | 18 | ||||
-rw-r--r-- | arch/sh/Makefile | 8 | ||||
-rw-r--r-- | arch/sh/ramdisk/Makefile | 20 | ||||
-rw-r--r-- | arch/sh/ramdisk/ld.script | 9 |
4 files changed, 0 insertions, 55 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 3e804c736e64..7d31d628cdec 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig | |||
@@ -770,24 +770,6 @@ source "fs/Kconfig.binfmt" | |||
770 | 770 | ||
771 | endmenu | 771 | endmenu |
772 | 772 | ||
773 | menu "SH initrd options" | ||
774 | depends on BLK_DEV_INITRD | ||
775 | |||
776 | config EMBEDDED_RAMDISK | ||
777 | bool "Embed root filesystem ramdisk into the kernel" | ||
778 | |||
779 | config EMBEDDED_RAMDISK_IMAGE | ||
780 | string "Filename of gziped ramdisk image" | ||
781 | depends on EMBEDDED_RAMDISK | ||
782 | default "ramdisk.gz" | ||
783 | help | ||
784 | This is the filename of the ramdisk image to be built into the | ||
785 | kernel. Relative pathnames are relative to arch/sh/ramdisk/. | ||
786 | The ramdisk image is not part of the kernel distribution; you must | ||
787 | provide one yourself. | ||
788 | |||
789 | endmenu | ||
790 | |||
791 | source "net/Kconfig" | 773 | source "net/Kconfig" |
792 | 774 | ||
793 | source "drivers/Kconfig" | 775 | source "drivers/Kconfig" |
diff --git a/arch/sh/Makefile b/arch/sh/Makefile index 4a3049080b41..67192d6b00d8 100644 --- a/arch/sh/Makefile +++ b/arch/sh/Makefile | |||
@@ -60,14 +60,6 @@ LIBGCC := $(shell $(CC) $(CFLAGS) -print-libgcc-file-name) | |||
60 | 60 | ||
61 | core-y += arch/sh/kernel/ arch/sh/mm/ | 61 | core-y += arch/sh/kernel/ arch/sh/mm/ |
62 | 62 | ||
63 | # | ||
64 | # ramdisk/initrd support | ||
65 | # You need a compressed ramdisk image, named | ||
66 | # CONFIG_EMBEDDED_RAMDISK_IMAGE. Relative pathnames | ||
67 | # are relative to arch/sh/ramdisk/. | ||
68 | # | ||
69 | core-$(CONFIG_EMBEDDED_RAMDISK) += arch/sh/ramdisk/ | ||
70 | |||
71 | # Boards | 63 | # Boards |
72 | machdir-$(CONFIG_SH_SOLUTION_ENGINE) := se/770x | 64 | machdir-$(CONFIG_SH_SOLUTION_ENGINE) := se/770x |
73 | machdir-$(CONFIG_SH_7751_SOLUTION_ENGINE) := se/7751 | 65 | machdir-$(CONFIG_SH_7751_SOLUTION_ENGINE) := se/7751 |
diff --git a/arch/sh/ramdisk/Makefile b/arch/sh/ramdisk/Makefile deleted file mode 100644 index 99e1c68673cf..000000000000 --- a/arch/sh/ramdisk/Makefile +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | # | ||
2 | # Makefile for a ramdisk image | ||
3 | # | ||
4 | |||
5 | obj-y += ramdisk.o | ||
6 | |||
7 | |||
8 | O_FORMAT = $(shell $(OBJDUMP) -i | head -n 2 | grep elf32) | ||
9 | img := $(subst ",,$(CONFIG_EMBEDDED_RAMDISK_IMAGE)) | ||
10 | # add $(src) when $(img) is relative | ||
11 | img := $(subst $(src)//,/,$(src)/$(img)) | ||
12 | |||
13 | quiet_cmd_ramdisk = LD $@ | ||
14 | define cmd_ramdisk | ||
15 | $(LD) -T $(srctree)/$(src)/ld.script -b binary --oformat $(O_FORMAT) \ | ||
16 | -o $@ $(img) | ||
17 | endef | ||
18 | |||
19 | $(obj)/ramdisk.o: $(img) $(srctree)/$(src)/ld.script | ||
20 | $(call cmd,ramdisk) | ||
diff --git a/arch/sh/ramdisk/ld.script b/arch/sh/ramdisk/ld.script deleted file mode 100644 index 94beee248c04..000000000000 --- a/arch/sh/ramdisk/ld.script +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | OUTPUT_ARCH(sh) | ||
2 | SECTIONS | ||
3 | { | ||
4 | .initrd : | ||
5 | { | ||
6 | *(.data) | ||
7 | } | ||
8 | } | ||
9 | |||