Skip to contentSkip to conversation

arm926ejs: fix linker file for newer ld support

PATCH Superseded Albert Aribaud 3 participants 7 messages Nov 1, 2010 – Nov 2, 2010 Arm (32-bit)

v1 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 arm926ejs: fix linker file for newer ld support

older ld emitted all ELF relocations in input sections named .rel.dyn, whereas newer ld uses names of the form .rel*. The linker script only collected .rel.dyn input sections. Fit it to collect all .rel* input sections.

---
 arch/arm/cpu/arm926ejs/u-boot.lds |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)
arch/arm/cpu/arm926ejs/u-boot.lds +9 -9
index 72f45f8..4e42543 100644
@@ -45,15 +45,6 @@ SECTIONS
 
 	. = ALIGN(4);
 
-	__rel_dyn_start = .;
-	.rel.dyn : { *(.rel.dyn) }
-	__rel_dyn_end = .;
-
-	__dynsym_start = .;
-	.dynsym : { *(.dynsym) }
-
-	. = ALIGN(4);
-
 	. = .;
 	__u_boot_cmd_start = .;
 	.u_boot_cmd : { *(.u_boot_cmd) }
@@ -64,6 +55,15 @@ SECTIONS
 	.bss (NOLOAD) : { *(.bss) . = ALIGN(4); }
 	_end = .;
 
+	__rel_dyn_start = .;
+	.rel.dyn : { *(.rel*) }
+	__rel_dyn_end = .;
+
+	__dynsym_start = .;
+	.dynsym : { *(.dynsym) }
+
+	. = ALIGN(4);
+
 	/DISCARD/ : { *(.dynstr*) }
 	/DISCARD/ : { *(.dynamic*) }
 	/DISCARD/ : { *(.plt*) }
Signature · 1 line
1.7.1
#1 lore raw

PATCH 2/3 tx25: fix linker file for newer ld support

From: Wolfgang Denk <[email protected]>

older ld emitted all ELF relocations in input sections named .rel.dyn, whereas newer ld uses names of the form .rel*. The linker script only collected .rel.dyn input sections. Fit it to collect all .rel* input sections.

---
 nand_spl/board/karo/tx25/u-boot.lds |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)
nand_spl/board/karo/tx25/u-boot.lds +9 -4
index 5f95c87..f3cb8dd 100644
@@ -54,10 +54,6 @@ SECTIONS
 	}
 
 	. = ALIGN(4);
-	__rel_dyn_start = .;
-	__rel_dyn_end = .;
-	__dynsym_start = .;
-
 	__got_start = .;
 	. = ALIGN(4);
 	.got : { *(.got) }
@@ -72,6 +68,15 @@ SECTIONS
 	__bss_start = .;
 	.bss : { *(.bss) }
 	_end = .;
+
+	. = ALIGN(4);
+	__rel_dyn_start = .;
+	.rel.dyn : { *(.rel*) }
+	__rel_dyn_end = .;
+
+	__dynsym_start = .;
+	.dynsym : { *(.dynsym) }
+
 	/DISCARD/ : { *(.bss*) }
 	/DISCARD/ : { *(.dynstr*) }
 	/DISCARD/ : { *(.dynsym*) }
Signature · 1 line
1.7.1
#2 lore raw

PATCH 2/3 tx25: fix linker file for newer ld support

Dear Albert Aribaud,

Quoted 17 lines · In message <[email protected]> you wrote:

From: Wolfgang Denk <[email protected]>

older ld emitted all ELF relocations in input sections named .rel.dyn, whereas newer ld uses names of the form .rel*. The linker script only collected .rel.dyn input sections. Fit it to collect all .rel* input sections.

---
 nand_spl/board/karo/tx25/u-boot.lds |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)
nand_spl/board/karo/tx25/u-boot.lds +0 -0
index 5f95c87..f3cb8dd 100644

nand_spl/board/karo/tx25/u-boot.lds SECTIONS · line 59

Quoted 10 lines
nand_spl/board/karo/tx25/u-boot.lds +0 -4
@@ -54,10 +54,6 @@ SECTIONS
 	}
 
 	. = ALIGN(4);
-	__rel_dyn_start = .;
-	__rel_dyn_end = .;
-	__dynsym_start = .;
-
 	__got_start = .;
 	. = ALIGN(4);
 	.got : { *(.got) }

Do we still need this GOT entry?

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
What is mind?  No matter.  What is matter?  Never mind.
                                      -- Thomas Hewitt Key, 1799-1875
#3 lore raw

PATCH 2/3 tx25: fix linker file for newer ld support

Le 01/11/2010 23:11, Wolfgang Denk a ?crit :

Quoted 5 lines
Quoted 3 lines
  	__got_start = .;
  	. = ALIGN(4);
  	.got : { *(.got) }

Do we still need this GOT entry?

Indeed no, and we do not need the datarel entries either. I'm reposting a V2 patch set with these plus minor fixes to the arm926ejs linker file too.

Quoted 3 lines

Best regards,

Wolfgang Denk

Amicalement,

Signature · 1 line
Albert.
#4 lore raw

PATCH 2/3 tx25: fix linker file for newer ld support

Hello Albert,

Quoted 9 lines · Albert ARIBAUD

Le 01/11/2010 23:11, Wolfgang Denk a ?crit :

Quoted 4 lines
Quoted 3 lines
  	__got_start = .;
  	. = ALIGN(4);
  	.got : { *(.got) }

Do we still need this GOT entry?

Indeed no, and we do not need the datarel entries either. I'm reposting a V2 patch set with these plus minor fixes to the arm926ejs linker file too.

Acked, thanks.

thought this was long time ago gone ...

bye,
Heiko

Signature · 2 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
#5 lore raw

PATCH 3/3 tx25: increase u-boot NAND size to match current build sizes

In reply to Albert Aribaud

U-boot binary size increase made u-boot-spl copy only part of u-boot deom NAND to RAM, missing part of the relocation data. Increase u-boot NAND size to match current build size, plus a bit of slack.

---
 include/configs/tx25.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
include/configs/tx25.h +1 -1
index 8f8a1a3..6dcaf4c 100644
@@ -39,7 +39,7 @@
 #ifdef CONFIG_NAND_SPL
 /* Start copying real U-boot from the second page */
 #define CONFIG_SYS_NAND_U_BOOT_OFFS	0x800
-#define CONFIG_SYS_NAND_U_BOOT_SIZE	0x30000
+#define CONFIG_SYS_NAND_U_BOOT_SIZE	0x31000
 
 #define CONFIG_SYS_NAND_U_BOOT_DST      (0x81200000)
 #define CONFIG_SYS_NAND_U_BOOT_START    CONFIG_SYS_NAND_U_BOOT_DST
Signature · 1 line
1.7.1
#6 lore raw

PATCH 3/3 tx25: increase u-boot NAND size to match current build sizes

Le 01/11/2010 21:17, Albert Aribaud a ?crit :

Quoted 1 line

part of u-boot deom NAND to RAM, missing part of the

s/deom/from/

Amicalement,

Signature · 1 line
Albert.