Commit 9ad79b58 authored by Max Filippov's avatar Max Filippov Committed by Chris Zankel
Browse files

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: default avatarMax Filippov <jcmvbkbc@gmail.com>
Signed-off-by: default avatarChris Zankel <chris@zankel.net>
parent b973b4c9

arch/xtensa/Kconfig

+0 −17
Original line number Diff line number Diff line
@@ -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"

arch/xtensa/Makefile

+1 −7
Original line number Diff line number Diff line
@@ -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

arch/xtensa/boot/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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))

arch/xtensa/boot/boot-elf/Makefile

+0 −17
Original line number Diff line number Diff line
@@ -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

arch/xtensa/boot/boot-elf/boot.lds.S

+0 −7
Original line number Diff line number Diff line
@@ -33,13 +33,6 @@ SECTIONS 


	__reloc_end = . ;



	.initrd ALIGN(0x10) :

	{

		boot_initrd_start = . ;

		*(.initrd)

		boot_initrd_end = .;

	}



	. = ALIGN(0x10);

	__image_load = . ;

	.image 0xd0001000:

CRA Git | Maintained and supported by SUSTech CRA and CCSE