dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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:
Max Filippov 2012-09-17 05:44:50 +04:00 committed by Chris Zankel
parent b973b4c91b
commit 9ad79b5851
11 changed files with 2 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
arch/xtensa/Kconfig
View File

@ -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"

8
arch/xtensa/Makefile
View File

@ -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

2
arch/xtensa/boot/Makefile
View File

@ -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))

17
arch/xtensa/boot/boot-elf/Makefile
View File

@ -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

7
arch/xtensa/boot/boot-elf/boot.lds.S
View File

@ -33,13 +33,6 @@ SECTIONS
__reloc_end = . ;
.initrd ALIGN(0x10) :
{
boot_initrd_start = . ;
*(.initrd)
boot_initrd_end = .;
}
. = ALIGN(0x10);
__image_load = . ;
.image 0xd0001000:

7
arch/xtensa/boot/boot-redboot/boot.ld
View File

@ -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)

10
arch/xtensa/boot/boot-redboot/bootstrap.S
View File

@ -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

23
arch/xtensa/boot/ramdisk/Makefile
View File

@ -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 $@

5
arch/xtensa/configs/s6105_defconfig
View File

@ -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
#

12
arch/xtensa/kernel/setup.c
View File

@ -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

5
arch/xtensa/kernel/vmlinux.lds.S
View File

@ -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)