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>
This commit is contained in:
parent
b973b4c91b
commit
9ad79b5851
|
@ -227,23 +227,6 @@ source "drivers/Kconfig"
|
||||||
|
|
||||||
source "fs/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 "arch/xtensa/Kconfig.debug"
|
||||||
|
|
||||||
source "security/Kconfig"
|
source "security/Kconfig"
|
||||||
|
|
|
@ -48,12 +48,6 @@ endif
|
||||||
|
|
||||||
KBUILD_DEFCONFIG := iss_defconfig
|
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
|
# Test for cross compiling
|
||||||
|
|
||||||
ifneq ($(VARIANT),)
|
ifneq ($(VARIANT),)
|
||||||
|
@ -87,7 +81,7 @@ all: zImage
|
||||||
|
|
||||||
bzImage : zImage
|
bzImage : zImage
|
||||||
|
|
||||||
zImage zImage.initrd: vmlinux
|
zImage: vmlinux
|
||||||
$(Q)$(MAKE) $(build)=$(boot) $@
|
$(Q)$(MAKE) $(build)=$(boot) $@
|
||||||
|
|
||||||
define archhelp
|
define archhelp
|
||||||
|
|
|
@ -25,7 +25,7 @@ bootdir-$(CONFIG_XTENSA_PLATFORM_ISS) += boot-elf
|
||||||
bootdir-$(CONFIG_XTENSA_PLATFORM_XT2000) += boot-redboot 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)) \
|
$(bootdir-y): $(addprefix $(obj)/,$(subdir-y)) \
|
||||||
$(addprefix $(obj)/,$(host-progs))
|
$(addprefix $(obj)/,$(host-progs))
|
||||||
|
|
|
@ -33,22 +33,5 @@ Image: vmlinux.tmp $(OBJS) arch/$(ARCH)/boot/boot-elf/boot.lds
|
||||||
-T arch/$(ARCH)/boot/boot-elf/boot.lds \
|
-T arch/$(ARCH)/boot/boot-elf/boot.lds \
|
||||||
-o arch/$(ARCH)/boot/$@.elf $@.tmp
|
-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: Image
|
||||||
|
|
||||||
zImage.initrd: Image.initrd
|
|
||||||
|
|
||||||
|
|
|
@ -33,13 +33,6 @@ SECTIONS
|
||||||
|
|
||||||
__reloc_end = . ;
|
__reloc_end = . ;
|
||||||
|
|
||||||
.initrd ALIGN(0x10) :
|
|
||||||
{
|
|
||||||
boot_initrd_start = . ;
|
|
||||||
*(.initrd)
|
|
||||||
boot_initrd_end = .;
|
|
||||||
}
|
|
||||||
|
|
||||||
. = ALIGN(0x10);
|
. = ALIGN(0x10);
|
||||||
__image_load = . ;
|
__image_load = . ;
|
||||||
.image 0xd0001000:
|
.image 0xd0001000:
|
||||||
|
|
|
@ -31,13 +31,6 @@ SECTIONS
|
||||||
|
|
||||||
__reloc_end = . ;
|
__reloc_end = . ;
|
||||||
|
|
||||||
.initrd ALIGN(0x10) :
|
|
||||||
{
|
|
||||||
boot_initrd_start = . ;
|
|
||||||
*(.initrd)
|
|
||||||
boot_initrd_end = .;
|
|
||||||
}
|
|
||||||
|
|
||||||
. = ALIGN(0x10);
|
. = ALIGN(0x10);
|
||||||
__image_load = . ;
|
__image_load = . ;
|
||||||
.image 0xd0001000: AT(__image_load)
|
.image 0xd0001000: AT(__image_load)
|
||||||
|
|
|
@ -226,17 +226,7 @@ _reloc:
|
||||||
|
|
||||||
isync
|
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
|
# a2 Boot parameter list
|
||||||
# a3 initrd_start (virtual load address)
|
|
||||||
# a4 initrd_end (virtual load address)
|
|
||||||
|
|
||||||
movi a0, _image_start
|
movi a0, _image_start
|
||||||
jx a0
|
jx a0
|
||||||
|
|
|
@ -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 $@
|
|
||||||
|
|
|
@ -540,11 +540,6 @@ CONFIG_MSDOS_PARTITION=y
|
||||||
# CONFIG_NLS is not set
|
# CONFIG_NLS is not set
|
||||||
# CONFIG_DLM is not set
|
# CONFIG_DLM is not set
|
||||||
|
|
||||||
#
|
|
||||||
# Xtensa initrd options
|
|
||||||
#
|
|
||||||
# CONFIG_EMBEDDED_RAMDISK is not set
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Kernel hacking
|
# Kernel hacking
|
||||||
#
|
#
|
||||||
|
|
|
@ -60,8 +60,6 @@ struct rtc_ops *rtc_ops;
|
||||||
#ifdef CONFIG_BLK_DEV_INITRD
|
#ifdef CONFIG_BLK_DEV_INITRD
|
||||||
extern void *initrd_start;
|
extern void *initrd_start;
|
||||||
extern void *initrd_end;
|
extern void *initrd_end;
|
||||||
extern void *__initrd_start;
|
|
||||||
extern void *__initrd_end;
|
|
||||||
int initrd_is_mapped = 0;
|
int initrd_is_mapped = 0;
|
||||||
extern int initrd_below_start_ok;
|
extern int initrd_below_start_ok;
|
||||||
#endif
|
#endif
|
||||||
|
@ -79,10 +77,6 @@ static char default_command_line[COMMAND_LINE_SIZE] __initdata = CONFIG_CMDLINE;
|
||||||
|
|
||||||
sysmem_info_t __initdata sysmem;
|
sysmem_info_t __initdata sysmem;
|
||||||
|
|
||||||
#ifdef CONFIG_BLK_DEV_INITRD
|
|
||||||
int initrd_is_mapped;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef CONFIG_MMU
|
#ifdef CONFIG_MMU
|
||||||
extern void init_mmu(void);
|
extern void init_mmu(void);
|
||||||
#else
|
#else
|
||||||
|
@ -197,12 +191,6 @@ static int __init parse_bootparam(const bp_tag_t* tag)
|
||||||
|
|
||||||
void __init init_arch(bp_tag_t *bp_start)
|
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;
|
sysmem.nr_banks = 0;
|
||||||
|
|
||||||
#ifdef CONFIG_CMDLINE_BOOL
|
#ifdef CONFIG_CMDLINE_BOOL
|
||||||
|
|
|
@ -222,11 +222,6 @@ SECTIONS
|
||||||
. = ALIGN(0x10);
|
. = ALIGN(0x10);
|
||||||
.bootstrap : { *(.bootstrap.literal .bootstrap.text .bootstrap.data) }
|
.bootstrap : { *(.bootstrap.literal .bootstrap.text .bootstrap.data) }
|
||||||
|
|
||||||
. = ALIGN(0x1000);
|
|
||||||
__initrd_start = .;
|
|
||||||
.initrd : { *(.initrd) }
|
|
||||||
__initrd_end = .;
|
|
||||||
|
|
||||||
.ResetVector.text XCHAL_RESET_VECTOR_VADDR :
|
.ResetVector.text XCHAL_RESET_VECTOR_VADDR :
|
||||||
{
|
{
|
||||||
*(.ResetVector.text)
|
*(.ResetVector.text)
|
||||||
|
|
Reference in New Issue