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 <[EMAIL PROTECTED]>
---
 board/bf533-ezkit/u-boot.lds.S |    7 ++++++-
 board/bf533-stamp/u-boot.lds.S |    7 ++++++-
 board/bf537-stamp/u-boot.lds.S |    7 ++++++-
 board/bf561-ezkit/u-boot.lds.S |    7 ++++++-
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/board/bf533-ezkit/u-boot.lds.S b/board/bf533-ezkit/u-boot.lds.S
index 538a19f..70764ac 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 97ebd79..187309f 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 97ebd79..187309f 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 3defef4..99d6be6 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
 
-- 
1.6.0.2


-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
U-Boot-Users mailing list
U-Boot-Users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users

Reply via email to