Merge branch 'master' of git://git.denx.de/u-boot-sh

[u-boot] / board / bf533-stamp / u-boot.lds.S

diff --git a/board/bf533-stamp/u-boot.lds.S b/board/bf533-stamp/u-boot.lds.S
index 01780c570c90145817e23b01c206d55ff8bf9f3c..187309f3fcff65af51df5a9d2eff2ba612dc3375 100644 (file)
--- a/board/bf533-stamp/u-boot.lds.S
+++ b/board/bf533-stamp/u-boot.lds.S
@@ -36,7 +36,7 @@
  * for different CPU's which may lack non-cache L1 data.
  */
 #ifndef L1_DATA_B_SRAM
-# define L1_DATA_B_SRAM      CFG_MONITOR_BASE
+# define L1_DATA_B_SRAM      CONFIG_SYS_MONITOR_BASE
 # define L1_DATA_B_SRAM_SIZE 0
 #endif
 
@@ -45,7 +45,7 @@ OUTPUT_ARCH(bfin)
 /* The 0xC offset is so we don't clobber the tiny LDR jump block. */
 MEMORY
 {
-       ram     : ORIGIN = CFG_MONITOR_BASE, LENGTH = CFG_MONITOR_LEN
+       ram     : ORIGIN = CONFIG_SYS_MONITOR_BASE, LENGTH = CONFIG_SYS_MONITOR_LEN
        l1_code : ORIGIN = L1_INST_SRAM+0xC, LENGTH = L1_INST_SRAM_SIZE
        l1_data : ORIGIN = L1_DATA_B_SRAM,   LENGTH = L1_DATA_B_SRAM_SIZE
 }
@@ -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)
@@ -69,9 +70,13 @@ SECTIONS
                lib_generic/crc32.o             (.text)
 
                . = DEFINED(env_offset) ? env_offset : .;
-               common/environment.o    (.text)
+               common/env_embedded.o   (.text)
 #endif
 
+               __initcode_start = .;
+               cpu/blackfin/initcode.o (.text)
+               __initcode_end = .;
+
                *(.text .text.*)
        } >ram