summaryrefslogtreecommitdiff
path: root/board/freescale/mx6q_sabresd
diff options
context:
space:
mode:
authorZhang Jiejing <jiejing.zhang@freescale.com>2012-07-25 11:35:11 +0800
committerZhang Jiejing <jiejing.zhang@freescale.com>2012-07-25 14:38:35 +0800
commit2dbfc63a4a0206d31e419d9e595828e6408dce48 (patch)
treeebc8de8f6a8e2550444f22fbe9db2b883efb96e0 /board/freescale/mx6q_sabresd
parent3c3fe71df7f1ac0f12baaab4a71df84aa3ef73a9 (diff)
downloadu-boot-imx-2dbfc63a4a0206d31e419d9e595828e6408dce48.zip
u-boot-imx-2dbfc63a4a0206d31e419d9e595828e6408dce48.tar.gz
u-boot-imx-2dbfc63a4a0206d31e419d9e595828e6408dce48.tar.bz2
ENGR00218282 MX6Q: fix linker error when more configure enabled.
This commit fix the linker error when enable more function(like CONFIG_NAND, CONFIG_SPASHSCREEN,etc) in uboot ARM2 board, and a possable linker error for other MX6 boards: /home/lambert/share/SATA2/R13.3/prebuilt/linux-x86/toolchain/arm-eabi-4.4.3/ bin/arm-eabi-ld: section .bss [27831000 -> 278666e7] overlaps section .rodata [2782387c -> 278609eb] /home/lambert/share/SATA2/R13.3/prebuilt/linux-x86/toolchain/arm-eabi-4.4.3/ bin/arm-eabi-ld: section .rodata.str1.1 [278609ec -> 27867803] overlaps section .bss [27831000 -> 278666e7] One issue here is: A recent gcc added a new unaligned rodata section called '.rodata.str1.1', which needs to be added the the linker script. Instead of just adding this one section, we use a wildcard ".rodata*" to get all rodata linker section gcc has now and might add in the future. Another issue is: The secure boot feature require __hab_data section in uboot linker script, but it's have a hard coding magic number, but if we enable more code, cause .text section bigger, it will cross the line, so it report the first linker error. This commit disable SECURE_BOOT feature by default for android, and comments if user want to use this feature, it needs change the .lds by there configure. Also, enlarge the magic number that this feature needs to cover if more code is build in. Signed-off-by: Zhang Jiejing <jiejing.zhang@freescale.com>
Diffstat (limited to 'board/freescale/mx6q_sabresd')
-rw-r--r--board/freescale/mx6q_sabresd/u-boot.lds2
1 files changed, 1 insertions, 1 deletions
diff --git a/board/freescale/mx6q_sabresd/u-boot.lds b/board/freescale/mx6q_sabresd/u-boot.lds
index 1473ea9..9b678da 100644
--- a/board/freescale/mx6q_sabresd/u-boot.lds
+++ b/board/freescale/mx6q_sabresd/u-boot.lds
@@ -53,7 +53,7 @@ SECTIONS
}
. = ALIGN(4);
- .rodata : { *(.rodata) }
+ .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) }
. = ALIGN(4);
.data : { *(.data) }