diff options
author | 2010-11-02 18:04:04 +0100 | |
---|---|---|
committer | 2010-11-18 13:02:54 +0100 | |
commit | 8cb473da3fe634fb30c1e5be8840b00f499103a8 (patch) | |
tree | 6dd61cccc6e8f5f451898780969342bdb8c783a5 /arch/microblaze/kernel/vmlinux.lds.S | |
parent | arch/microblaze: Remove unnecessary semicolons (diff) | |
download | linux-8cb473da3fe634fb30c1e5be8840b00f499103a8.tar.gz linux-8cb473da3fe634fb30c1e5be8840b00f499103a8.tar.bz2 linux-8cb473da3fe634fb30c1e5be8840b00f499103a8.zip |
microblaze: Fix initramfs
Patch: initramfs: generalize initramfs_data.xxx.S variants
(sha1 6ae64e428f74e7bacab898ef9665dda719ea6fde)
requires hooks in linker script.
Signed-off-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch/microblaze/kernel/vmlinux.lds.S')
-rw-r--r-- | arch/microblaze/kernel/vmlinux.lds.S | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/arch/microblaze/kernel/vmlinux.lds.S b/arch/microblaze/kernel/vmlinux.lds.S index 96a88c31fe48..3451bdec9f05 100644 --- a/arch/microblaze/kernel/vmlinux.lds.S +++ b/arch/microblaze/kernel/vmlinux.lds.S @@ -123,20 +123,10 @@ SECTIONS { __init_end_before_initramfs = .; - .init.ramfs ALIGN(PAGE_SIZE) : AT(ADDR(.init.ramfs) - LOAD_OFFSET) { - __initramfs_start = .; - *(.init.ramfs) - __initramfs_end = .; - . = ALIGN(4); - LONG(0); -/* - * FIXME this can break initramfs for MMU. - * Pad init.ramfs up to page boundary, - * so that __init_end == __bss_start. This will make image.elf - * consistent with the image.bin - */ - /* . = ALIGN(PAGE_SIZE); */ + .init.ramfs : AT(ADDR(.init.ramfs) - LOAD_OFFSET) { + INIT_RAM_FS } + __init_end = .; .bss ALIGN (PAGE_SIZE) : AT(ADDR(.bss) - LOAD_OFFSET) { |