xtensa: drop CONFIG_EMBEDDED_RAMDISK

Remove Kconfig entries, boot subdirectory, dependencies from other
boot-* Makefiles, and sections from ld scripts.

Remove stale redboot code that used to pass initrd addresses in a3 and
a4 to _start.

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Chris Zankel <chris@zankel.net>

diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index 282be264cd021a394fbd0b6608ac77cf5bb14f35..cebbcfbe9d6d990bbef8d596b749c2074f2fbb41 100644 (file)
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -227,23 +227,6 @@ source "drivers/Kconfig"
 
 source "fs/Kconfig"
 
-menu "Xtensa 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 gzipped 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/xtensa/boot/ramdisk/.
-         The ramdisk image is not part of the kernel distribution; you must
-         provide one yourself.
-endmenu
-
 source "arch/xtensa/Kconfig.debug"
 
 source "security/Kconfig"

diff --git a/arch/xtensa/Makefile b/arch/xtensa/Makefile
index b201d4486098741fbf571cb0ebe729dfcd4174a6..735916b3daee63bfcde1352e4056f1ec4709f3b3 100644 (file)
--- a/arch/xtensa/Makefile
+++ b/arch/xtensa/Makefile
@@ -48,12 +48,6 @@ endif
 
 KBUILD_DEFCONFIG := iss_defconfig
 
-# ramdisk/initrd support
-# You need a compressed ramdisk image, named ramdisk.gz in
-# arch/xtensa/boot/ramdisk
-
-core-$(CONFIG_EMBEDDED_RAMDISK)        += arch/xtensa/boot/ramdisk/
-
 # Test for cross compiling
 
 ifneq ($(VARIANT),)
@@ -87,7 +81,7 @@ all: zImage
 
 bzImage : zImage
 
-zImage zImage.initrd: vmlinux
+zImage: vmlinux
        $(Q)$(MAKE) $(build)=$(boot) $@
 
 define archhelp

diff --git a/arch/xtensa/boot/Makefile b/arch/xtensa/boot/Makefile
index 70fd1453e172abcd48c54e11b8fd0af278f3fe45..4018f899419603253841f67520c65cea57a9e1ec 100644 (file)
--- a/arch/xtensa/boot/Makefile
+++ b/arch/xtensa/boot/Makefile
@@ -25,7 +25,7 @@ bootdir-$(CONFIG_XTENSA_PLATFORM_ISS)  += boot-elf
 bootdir-$(CONFIG_XTENSA_PLATFORM_XT2000) += boot-redboot boot-elf
 
 
-zImage zImage.initrd Image Image.initrd: $(bootdir-y)
+zImage Image: $(bootdir-y)
 
 $(bootdir-y): $(addprefix $(obj)/,$(subdir-y)) \
              $(addprefix $(obj)/,$(host-progs))

diff --git a/arch/xtensa/boot/boot-elf/Makefile b/arch/xtensa/boot/boot-elf/Makefile
index 4bbc26f797f16b6ff0238b65001e3b0506c3f61e..f10992b890273de29bce8a8b2df264196e739426 100644 (file)
--- a/arch/xtensa/boot/boot-elf/Makefile
+++ b/arch/xtensa/boot/boot-elf/Makefile
@@ -33,22 +33,5 @@ Image:       vmlinux.tmp $(OBJS) arch/$(ARCH)/boot/boot-elf/boot.lds
                -T arch/$(ARCH)/boot/boot-elf/boot.lds \
                -o arch/$(ARCH)/boot/$@.elf $@.tmp
 
-Image.initrd:  vmlinux $(OBJS)
-       $(OBJCOPY) --strip-all -R .comment -R .note.gnu.build-id -O binary \
-               --add-section .initrd=arch/$(ARCH)/boot/ramdisk \
-               --set-section-flags .initrd=contents,alloc,load,load,data \
-               vmlinux vmlinux.tmp
-       $(OBJCOPY) $(OBJCOPY_ARGS) -R .comment \
-               --add-section image=vmlinux.tmp \
-               --set-section-flags image=contents,alloc,load,load,data \
-               $(OBJS) $@.tmp
-       $(LD) $(LDFLAGS) $(LDFLAGS_vmlinux) \
-               -T $(srctree)/arch/$(ARCH)/boot/boot-elf/boot.ld \
-               -o arch/$(ARCH)/boot/$@.elf $@.tmp
-#rm -f $@.tmp vmlinux.tmp
-
-
 zImage:        Image
 
-zImage.initrd: Image.initrd
-

diff --git a/arch/xtensa/boot/boot-elf/boot.lds.S b/arch/xtensa/boot/boot-elf/boot.lds.S
index 4e53b74dc44b67f7e873eccae36a1152b3157c94..7b646e0a64867417d6bda44e7f3c99bd1f843af5 100644 (file)
--- a/arch/xtensa/boot/boot-elf/boot.lds.S
+++ b/arch/xtensa/boot/boot-elf/boot.lds.S
@@ -33,13 +33,6 @@ SECTIONS
 
        __reloc_end = . ;
 
-       .initrd ALIGN(0x10) :
-       {
-               boot_initrd_start = . ;
-               *(.initrd)
-               boot_initrd_end = .;
-       }
-
        . = ALIGN(0x10);
        __image_load = . ;
        .image 0xd0001000:

diff --git a/arch/xtensa/boot/boot-redboot/boot.ld b/arch/xtensa/boot/boot-redboot/boot.ld
index 774db20d11f715cfd6aee5394c7960c8f9a9a064..5bbcaf9e830df7de973d125d5ef9ded9adbde2df 100644 (file)
--- a/arch/xtensa/boot/boot-redboot/boot.ld
+++ b/arch/xtensa/boot/boot-redboot/boot.ld
@@ -31,13 +31,6 @@ SECTIONS
 
        __reloc_end = . ;
 
-       .initrd ALIGN(0x10) :
-       {
-               boot_initrd_start = . ;
-               *(.initrd)
-               boot_initrd_end = .;
-       }
-
        . = ALIGN(0x10);
        __image_load = . ;
        .image 0xd0001000: AT(__image_load)

diff --git a/arch/xtensa/boot/boot-redboot/bootstrap.S b/arch/xtensa/boot/boot-redboot/bootstrap.S
index 5582e8cfac8f5162b4113ef286d6cc04d9d10592..4c316cd28a542b2f06685179eb0e37b7819b539a 100644 (file)
--- a/arch/xtensa/boot/boot-redboot/bootstrap.S
+++ b/arch/xtensa/boot/boot-redboot/bootstrap.S
@@ -226,17 +226,7 @@ _reloc:
 
        isync
 
-       movi    a5, __start
-       movi    a3, boot_initrd_start
-       movi    a4, boot_initrd_end
-       sub     a3, a3, a5
-       sub     a4, a4, a5
-       add     a3, a0, a3
-       add     a4, a0, a4
-
        # a2  Boot parameter list
-       # a3  initrd_start (virtual load address)
-       # a4  initrd_end   (virtual load address)
 
        movi    a0, _image_start
        jx      a0

diff --git a/arch/xtensa/boot/ramdisk/Makefile b/arch/xtensa/boot/ramdisk/Makefile
deleted file mode 100644 (file)
index b12f763..0000000
--- a/arch/xtensa/boot/ramdisk/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Makefile for a ramdisk image
-#
-
-BIG_ENDIAN     := $(shell echo -e "\#ifdef __XTENSA_EL__\nint little;\n\#else\nint big;\n\#endif" | $(CC) -E -|grep -c big)
-
-ifeq ($(BIG_ENDIAN),1)
-OBJCOPY_ARGS    := -O elf32-xtensa-be
-else
-OBJCOPY_ARGS    := -O elf32-xtensa-le
-endif
-
-obj-y = ramdisk.o
-
-RAMDISK_IMAGE = arch/$(ARCH)/boot/ramdisk/$(CONFIG_EMBEDDED_RAMDISK_IMAGE)
-
-arch/$(ARCH)/boot/ramdisk/ramdisk.o:
-       $(Q)echo -e "dummy:" | $(AS) -o $@;
-       $(Q)$(OBJCOPY) $(OBJCOPY_ARGS)                                      \
-               --add-section .initrd=$(RAMDISK_IMAGE)                      \
-               --set-section-flags .initrd=contents,alloc,load,load,data   \
-               arch/$(ARCH)/boot/ramdisk/ramdisk.o $@
-

diff --git a/arch/xtensa/configs/s6105_defconfig b/arch/xtensa/configs/s6105_defconfig
index 550e8ed5b5c6db62bdb6558cae245d9aaf45bb80..eaf1b8fc655652a11f0aaa8ab479e49f07c064bc 100644 (file)
--- a/arch/xtensa/configs/s6105_defconfig
+++ b/arch/xtensa/configs/s6105_defconfig
@@ -540,11 +540,6 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_NLS is not set
 # CONFIG_DLM is not set
 
-#
-# Xtensa initrd options
-#
-# CONFIG_EMBEDDED_RAMDISK is not set
-
 #
 # Kernel hacking
 #

diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c
index 17e746f7be604023856417a8d05dab6fcf3a4b37..270360d9806ca6832d0ff7d4aeeff62dfad910c7 100644 (file)
--- a/arch/xtensa/kernel/setup.c
+++ b/arch/xtensa/kernel/setup.c
@@ -60,8 +60,6 @@ struct rtc_ops *rtc_ops;
 #ifdef CONFIG_BLK_DEV_INITRD
 extern void *initrd_start;
 extern void *initrd_end;
-extern void *__initrd_start;
-extern void *__initrd_end;
 int initrd_is_mapped = 0;
 extern int initrd_below_start_ok;
 #endif
@@ -79,10 +77,6 @@ static char default_command_line[COMMAND_LINE_SIZE] __initdata = CONFIG_CMDLINE;
 
 sysmem_info_t __initdata sysmem;
 
-#ifdef CONFIG_BLK_DEV_INITRD
-int initrd_is_mapped;
-#endif
-
 #ifdef CONFIG_MMU
 extern void init_mmu(void);
 #else
@@ -197,12 +191,6 @@ static int __init parse_bootparam(const bp_tag_t* tag)
 
 void __init init_arch(bp_tag_t *bp_start)
 {
-
-#ifdef CONFIG_BLK_DEV_INITRD
-       initrd_start = &__initrd_start;
-       initrd_end = &__initrd_end;
-#endif
-
        sysmem.nr_banks = 0;
 
 #ifdef CONFIG_CMDLINE_BOOL

diff --git a/arch/xtensa/kernel/vmlinux.lds.S b/arch/xtensa/kernel/vmlinux.lds.S
index ee2e2089483d08a532d795743b9a532cf2311f93..255154f820b7f68cc1dda067c197d63031e2c369 100644 (file)
--- a/arch/xtensa/kernel/vmlinux.lds.S
+++ b/arch/xtensa/kernel/vmlinux.lds.S
@@ -222,11 +222,6 @@ SECTIONS
   . = ALIGN(0x10);
   .bootstrap : { *(.bootstrap.literal .bootstrap.text .bootstrap.data) }
 
-  . = ALIGN(0x1000);
-  __initrd_start = .;
-  .initrd : { *(.initrd) }
-  __initrd_end = .;
-
   .ResetVector.text XCHAL_RESET_VECTOR_VADDR :
   {
     *(.ResetVector.text)