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>

6 files changed, 1 insertions, 65 deletions

diff --git a/arch/xtensa/boot/Makefile b/arch/xtensa/boot/Makefile
index 70fd1453e172..4018f8994196 100644
--- 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 4bbc26f797f1..f10992b89027 100644
--- 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 4e53b74dc44b..7b646e0a6486 100644
--- 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 774db20d11f7..5bbcaf9e830d 100644
--- 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 5582e8cfac8f..4c316cd28a54 100644
--- 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
index b12f76352438..000000000000
--- 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 $@
-