Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 1198c6d45a1ef5f4f7fdfbf33ef7d270493ec575

Authored by Hendrik Brueckner
Committed by Michal Marek
1 parent c8ddb2713c
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

initramfs: Really fix build break on symbol-prefixed archs 

Define the __initramfs_size variable using VMLINUX_SYMBOL() to take care
of symbol-prefixed architectures, for example, blackfin.

Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Cc: Mike Frysinger <vapier.adi@gmail.com>
Cc: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>,
Cc: Michal Marek <mmarek@suse.cz>
Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
[mmarek: leave out Makefile change, since d63f6d1 already takes care of the
 SYMBOL_PREFIX define]
Signed-off-by: Michal Marek <mmarek@suse.cz>

Showing 1 changed file with 3 additions and 2 deletions Inline Diff

usr/initramfs_data.S
Diff comments   View file @ 1198c6d
1 /* 1 /*
2 initramfs_data includes the compressed binary that is the 2 initramfs_data includes the compressed binary that is the
3 filesystem used for early user space. 3 filesystem used for early user space.
4 Note: Older versions of "as" (prior to binutils 2.11.90.0.23 4 Note: Older versions of "as" (prior to binutils 2.11.90.0.23
5 released on 2001-07-14) dit not support .incbin. 5 released on 2001-07-14) dit not support .incbin.
6 If you are forced to use older binutils than that then the 6 If you are forced to use older binutils than that then the
7 following trick can be applied to create the resulting binary: 7 following trick can be applied to create the resulting binary:
8 8
9 9
10 ld -m elf_i386 --format binary --oformat elf32-i386 -r \ 10 ld -m elf_i386 --format binary --oformat elf32-i386 -r \
11 -T initramfs_data.scr initramfs_data.cpio.gz -o initramfs_data.o 11 -T initramfs_data.scr initramfs_data.cpio.gz -o initramfs_data.o
12 ld -m elf_i386 -r -o built-in.o initramfs_data.o 12 ld -m elf_i386 -r -o built-in.o initramfs_data.o
13 13
14 For including the .init.ramfs sections, see include/asm-generic/vmlinux.lds. 14 For including the .init.ramfs sections, see include/asm-generic/vmlinux.lds.
15 15
16 The above example is for i386 - the parameters vary from architectures. 16 The above example is for i386 - the parameters vary from architectures.
17 Eventually look up LDFLAGS_BLOB in an older version of the 17 Eventually look up LDFLAGS_BLOB in an older version of the
18 arch/$(ARCH)/Makefile to see the flags used before .incbin was introduced. 18 arch/$(ARCH)/Makefile to see the flags used before .incbin was introduced.
19 19
20 Using .incbin has the advantage over ld that the correct flags are set 20 Using .incbin has the advantage over ld that the correct flags are set
21 in the ELF header, as required by certain architectures. 21 in the ELF header, as required by certain architectures.
22 */ 22 */
23 23
24 #include <linux/stringify.h> 24 #include <linux/stringify.h>
25 #include <asm-generic/vmlinux.lds.h>
25 26
26 .section .init.ramfs,"a" 27 .section .init.ramfs,"a"
27 __irf_start: 28 __irf_start:
28 .incbin __stringify(INITRAMFS_IMAGE) 29 .incbin __stringify(INITRAMFS_IMAGE)
29 __irf_end: 30 __irf_end:
30 .section .init.ramfs.info,"a" 31 .section .init.ramfs.info,"a"
31 .globl __initramfs_size 32 .globl VMLINUX_SYMBOL(__initramfs_size)
32 __initramfs_size: 33 VMLINUX_SYMBOL(__initramfs_size):
33 #ifdef CONFIG_64BIT 34 #ifdef CONFIG_64BIT
34 .quad __irf_end - __irf_start 35 .quad __irf_end - __irf_start
35 #else 36 #else
36 .long __irf_end - __irf_start 37 .long __irf_end - __irf_start
37 #endif 38 #endif
38 39