zynq: Fix elf header generation
Subsystems (2)
PATCH 1/1 zynq: Fix elf header generation
This patch is here because of:
"arm: keep all sections in ELF file"
(sha1: 47ed5dd031d7d2c587e6afd386e79ccec1a1b7f7)
Our tools expect to have elf with only LOAD header. Without this fix also PHDR, INTERP and DYNAMIC headers are available in ELF.
---
Albert: We have discussed about patch via IRC that this is reasonable solution.
I am sending it for a record and if it is fine I will add it to my zynq branch and then will send you pull request.
--- arch/arm/cpu/armv7/zynq/u-boot.lds | 103 +++++++++++++++++++++++++++++++++++++ include/configs/zynq-common.h | 3 ++ 2 files changed, 106 insertions(+) create mode 100644 arch/arm/cpu/armv7/zynq/u-boot.lds
arch/arm/cpu/armv7/zynq/u-boot.lds new file +103 -0
@@ -0,0 +1,103 @@ +/* + * Copyright (c) 2004-2008 Texas Instruments + * + * (C) Copyright 2002 + * Gary Jennejohn, DENX Software Engineering, <[email protected]> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") +OUTPUT_ARCH(arm) +ENTRY(_start) +SECTIONS +{ + . = 0x00000000; + + . = ALIGN(4); + .text : + { + *(.__image_copy_start) + CPUDIR/start.o (.text*) + *(.text*) + } + + . = ALIGN(4); + .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) } + + . = ALIGN(4); + .data : { + *(.data*) + } + + . = ALIGN(4); + + . = .; + + . = ALIGN(4); + .u_boot_list : { + KEEP(*(SORT(.u_boot_list*))); + } + + . = ALIGN(4); + + .image_copy_end : + { + *(.__image_copy_end) + } + + .rel_dyn_start : + { + *(.__rel_dyn_start) + } + + .rel.dyn : { + *(.rel*) + } + + .rel_dyn_end : + { + *(.__rel_dyn_end) + } + + _end = .; + + /* + * Deprecated: this MMU section is used by pxa at present but + * should not be used by new boards/CPUs. + */ + . = ALIGN(4096); + .mmutable : { + *(.mmutable) + } + +/* + * Compiler-generated __bss_start and __bss_end, see arch/arm/lib/bss.c + * __bss_base and __bss_limit are for linker only (overlay ordering) + */ + + .bss_start __rel_dyn_start (OVERLAY) : { + KEEP(*(.__bss_start)); + __bss_base = .; + } + + .bss __bss_base (OVERLAY) : { + *(.bss*) + . = ALIGN(4); + __bss_limit = .; + } + + .bss_end __bss_limit (OVERLAY) : { + KEEP(*(.__bss_end)); + } + + /DISCARD/ : { *(.dynsym) } + /DISCARD/ : { *(.dynbss*) } + /DISCARD/ : { *(.dynstr*) } + /DISCARD/ : { *(.dynamic*) } + /DISCARD/ : { *(.plt*) } + /DISCARD/ : { *(.interp*) } + /DISCARD/ : { *(.gnu*) } + /DISCARD/ : { *(.ARM.exidx*) } + /DISCARD/ : { *(.gnu.linkonce.armexidx.*) } +}
include/configs/zynq-common.h +3 -0
@@ -216,6 +216,8 @@# define CONFIG_SYS_MMC_MAX_DEVICE 1#endif +#define CONFIG_SYS_LDSCRIPT "arch/arm/cpu/armv7/zynq/u-boot.lds" +/* Commands */ #include <config_cmd_default.h>
@@ -224,4 +226,5 @@#define CONFIG_CMD_MII #define CONFIG_CMD_TFTPPUT +#endif /* __CONFIG_ZYNQ_COMMON_H */
--
1.8.2.3
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140204/0577f625/attachment.pgp>
PATCH 1/1 zynq: Fix elf header generation
Quoted 9 lines · Michal Simek
This patch is here because of:
"arm: keep all sections in ELF file"
(sha1:47ed5dd031d7d2c587e6afd386e79ccec1a1b7f7)Our tools expect to have elf with only LOAD header. Without this fix also PHDR, INTERP and DYNAMIC headers are available in ELF.
Signed-off-by Michal Simek <[email protected]>
[snip]
Two things..
arch/arm/cpu/armv7/zynq/u-boot.lds line 72
Quoted 8 lines
arch/arm/cpu/armv7/zynq/u-boot.lds new file +8
-0+ /* + * Deprecated: this MMU section is used by pxa at present but + * should not be used by new boards/CPUs. + */ + . = ALIGN(4096); + .mmutable : { + *(.mmutable) + }
You don't need this do you? If not, drop it..
[snip]
arch/arm/cpu/armv7/zynq/u-boot.lds line 102
Quoted 9 lines
arch/arm/cpu/armv7/zynq/u-boot.lds new file +9
-0+ /DISCARD/ : { *(.dynsym) } + /DISCARD/ : { *(.dynbss*) } + /DISCARD/ : { *(.dynstr*) } + /DISCARD/ : { *(.dynamic*) } + /DISCARD/ : { *(.plt*) } + /DISCARD/ : { *(.interp*) } + /DISCARD/ : { *(.gnu*) } + /DISCARD/ : { *(.ARM.exidx*) } + /DISCARD/ : { *(.gnu.linkonce.armexidx.*) }
Here is the difference between your linker script and the main ARM one. Please add a comment block that explains that you need to discard more sections because the user is expected to pass this image on to tools that require them to be dropped so it's clear why there is this delta between the scripts. Thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140204/d3e90e90/attachment.pgp>
PATCH 1/1 zynq: Fix elf header generation
Quoted 15 lines · Tom Rini
Quoted 9 lines · Michal Simek
This patch is here because of:
"arm: keep all sections in ELF file"
(sha1:47ed5dd031d7d2c587e6afd386e79ccec1a1b7f7)Our tools expect to have elf with only LOAD header. Without this fix also PHDR, INTERP and DYNAMIC headers are available in ELF.
Signed-off-by Michal Simek <[email protected]>[snip]
Two things..
Quoted 10 lines
arch/arm/cpu/armv7/zynq/u-boot.lds line 72
Quoted 8 lines
arch/arm/cpu/armv7/zynq/u-boot.lds new file +8
-0+ /* + * Deprecated: this MMU section is used by pxa at present but + * should not be used by new boards/CPUs. + */ + . = ALIGN(4096); + .mmutable : { + *(.mmutable) + }You don't need this do you? If not, drop it..
I don't need it.
Quoted 17 lines
[snip]
arch/arm/cpu/armv7/zynq/u-boot.lds line 102
Quoted 9 lines
arch/arm/cpu/armv7/zynq/u-boot.lds new file +9
-0+ /DISCARD/ : { *(.dynsym) } + /DISCARD/ : { *(.dynbss*) } + /DISCARD/ : { *(.dynstr*) } + /DISCARD/ : { *(.dynamic*) } + /DISCARD/ : { *(.plt*) } + /DISCARD/ : { *(.interp*) } + /DISCARD/ : { *(.gnu*) } + /DISCARD/ : { *(.ARM.exidx*) } + /DISCARD/ : { *(.gnu.linkonce.armexidx.*) }Here is the difference between your linker script and the main ARM one. Please add a comment block that explains that you need to discard more sections because the user is expected to pass this image on to tools that require them to be dropped so it's clear why there is this delta between the scripts. Thanks!
Fixed in v2.
Thanks,
Michal
Signature · 14 lines
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/ Maintainer of Linux kernel - Xilinx Zynq ARM architecture Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 263 bytes Desc: OpenPGP digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140205/cfaaa811/attachment.pgp>
PATCH 1/1 zynq: Fix elf header generation
In reply to Michal SimekHello Michal,
Quoted 9 lines
include/configs/zynq-common.h +1
-1@@ -224,4 +226,5 @@#define CONFIG_CMD_MII #define CONFIG_CMD_TFTPPUT +#endif /* __CONFIG_ZYNQ_COMMON_H */ --1.8.2.3
Please do not double empty lines.
Best Regards
Masahiro Yamada
PATCH 1/1 zynq: Fix elf header generation
Quoted 7 lines · Masahiro Yamada
Hello Michal,
Quoted 4 lines
include/configs/zynq-common.h +0
-0@@ -224,4 +226,5 @@#define CONFIG_CMD_MII #define CONFIG_CMD_TFTPPUT
Quoted 8 lines
Quoted 5 lines
include/configs/zynq-common.h +1
-1+#endif /* __CONFIG_ZYNQ_COMMON_H */ --1.8.2.3
Please do not double empty lines.
Sure.
Just sent v2.
Thanks,
Michal
Signature · 14 lines
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/ Maintainer of Linux kernel - Xilinx Zynq ARM architecture Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 263 bytes Desc: OpenPGP digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140205/3e6d4d4c/attachment.pgp>