From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 12 Oct 2008 00:47:58 +0000 (-0400)
Subject: Blackfin: linker scripts: force start.o and set initcode boundaries
X-Git-Tag: v2009.01-rc1~102^2~3
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c23bff63fb03cb9dbcd26522841e53f9b34fa1ab;p=u-boot

Blackfin: linker scripts: force start.o and set initcode boundaries

Make sure that the start.o object is always the first object in our linker
script regardless of configuration settings, and add some linker symbols
so the ldr utility can properly locate the initcode when generating a LDR.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---

diff --git a/board/bf533-ezkit/u-boot.lds.S b/board/bf533-ezkit/u-boot.lds.S
index 538a19f81b..70764acf1a 100644
--- a/board/bf533-ezkit/u-boot.lds.S
+++ b/board/bf533-ezkit/u-boot.lds.S
@@ -54,6 +54,8 @@ SECTIONS
 {
 	.text :
 	{
+		cpu/blackfin/start.o (.text)
+
 #ifdef ENV_IS_EMBEDDED
 		/* WARNING - the following is hand-optimized to fit within
 		 * the sector before the environment sector. If it throws
@@ -61,7 +63,6 @@ SECTIONS
 		 * it linked after the configuration sector.
 		 */
 
-		cpu/blackfin/start.o		(.text)
 		cpu/blackfin/traps.o		(.text)
 		cpu/blackfin/interrupt.o	(.text)
 		cpu/blackfin/serial.o		(.text)
@@ -74,6 +75,10 @@ SECTIONS
 		common/env_embedded.o	(.text)
 #endif
 
+		__initcode_start = .;
+		cpu/blackfin/initcode.o (.text)
+		__initcode_end = .;
+
 		*(.text .text.*)
 	} >ram
 
diff --git a/board/bf533-stamp/u-boot.lds.S b/board/bf533-stamp/u-boot.lds.S
index 97ebd79260..187309f3fc 100644
--- a/board/bf533-stamp/u-boot.lds.S
+++ b/board/bf533-stamp/u-boot.lds.S
@@ -54,6 +54,8 @@ SECTIONS
 {
 	.text :
 	{
+		cpu/blackfin/start.o (.text)
+
 #ifdef ENV_IS_EMBEDDED
 		/* WARNING - the following is hand-optimized to fit within
 		 * the sector before the environment sector. If it throws
@@ -61,7 +63,6 @@ SECTIONS
 		 * it linked after the configuration sector.
 		 */
 
-		cpu/blackfin/start.o		(.text)
 		cpu/blackfin/traps.o		(.text)
 		cpu/blackfin/interrupt.o	(.text)
 		cpu/blackfin/serial.o		(.text)
@@ -72,6 +73,10 @@ SECTIONS
 		common/env_embedded.o	(.text)
 #endif
 
+		__initcode_start = .;
+		cpu/blackfin/initcode.o (.text)
+		__initcode_end = .;
+
 		*(.text .text.*)
 	} >ram
 
diff --git a/board/bf537-stamp/u-boot.lds.S b/board/bf537-stamp/u-boot.lds.S
index 97ebd79260..187309f3fc 100644
--- a/board/bf537-stamp/u-boot.lds.S
+++ b/board/bf537-stamp/u-boot.lds.S
@@ -54,6 +54,8 @@ SECTIONS
 {
 	.text :
 	{
+		cpu/blackfin/start.o (.text)
+
 #ifdef ENV_IS_EMBEDDED
 		/* WARNING - the following is hand-optimized to fit within
 		 * the sector before the environment sector. If it throws
@@ -61,7 +63,6 @@ SECTIONS
 		 * it linked after the configuration sector.
 		 */
 
-		cpu/blackfin/start.o		(.text)
 		cpu/blackfin/traps.o		(.text)
 		cpu/blackfin/interrupt.o	(.text)
 		cpu/blackfin/serial.o		(.text)
@@ -72,6 +73,10 @@ SECTIONS
 		common/env_embedded.o	(.text)
 #endif
 
+		__initcode_start = .;
+		cpu/blackfin/initcode.o (.text)
+		__initcode_end = .;
+
 		*(.text .text.*)
 	} >ram
 
diff --git a/board/bf561-ezkit/u-boot.lds.S b/board/bf561-ezkit/u-boot.lds.S
index 3defef45ae..99d6be634f 100644
--- a/board/bf561-ezkit/u-boot.lds.S
+++ b/board/bf561-ezkit/u-boot.lds.S
@@ -54,6 +54,8 @@ SECTIONS
 {
 	.text :
 	{
+		cpu/blackfin/start.o (.text)
+
 #ifdef ENV_IS_EMBEDDED
 		/* WARNING - the following is hand-optimized to fit within
 		 * the sector before the environment sector. If it throws
@@ -61,7 +63,6 @@ SECTIONS
 		 * it linked after the configuration sector.
 		 */
 
-		cpu/blackfin/start.o		(.text)
 		cpu/blackfin/traps.o		(.text)
 		cpu/blackfin/interrupt.o	(.text)
 		cpu/blackfin/serial.o		(.text)
@@ -74,6 +75,10 @@ SECTIONS
 		common/env_embedded.o	(.text)
 #endif
 
+		__initcode_start = .;
+		cpu/blackfin/initcode.o (.text)
+		__initcode_end = .;
+
 		*(.text .text.*)
 	} >ram