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

[platform/kernel/u-boot.git] / lib_blackfin / u-boot.lds.S

diff --git a/lib_blackfin/u-boot.lds.S b/lib_blackfin/u-boot.lds.S
index 4755153..2b23d8b 100644 (file)
--- a/lib_blackfin/u-boot.lds.S
+++ b/lib_blackfin/u-boot.lds.S
@@ -1,7 +1,7 @@
 /*
  * U-boot - u-boot.lds.S
  *
- * Copyright (c) 2005-2008 Analog Device Inc.
+ * Copyright (c) 2005-2010 Analog Device Inc.
  *
  * (C) Copyright 2000-2004
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
@@ -29,7 +29,6 @@
 #include <asm/blackfin.h>
 #undef ALIGN
 #undef ENTRY
-#undef bfin
 
 #ifndef LDS_BOARD_TEXT
 # define LDS_BOARD_TEXT
@@ -46,57 +45,75 @@
 # define L1_DATA_B_SRAM_SIZE 0
 #endif
 
+/* The 0xC offset is so we don't clobber the tiny LDR jump block. */
+#ifdef CONFIG_BFIN_BOOTROM_USES_EVT1
+# define L1_CODE_ORIGIN L1_INST_SRAM
+#else
+# define L1_CODE_ORIGIN L1_INST_SRAM + 0xC
+#endif
+
 OUTPUT_ARCH(bfin)
 
 MEMORY
 {
+#if CONFIG_MEM_SIZE
        ram     : ORIGIN = CONFIG_SYS_MONITOR_BASE, LENGTH = CONFIG_SYS_MONITOR_LEN
-       l1_code : ORIGIN = L1_INST_SRAM,            LENGTH = L1_INST_SRAM_SIZE
+# define ram_code ram
+# define ram_data ram
+#else
+# define ram_code l1_code
+# define ram_data l1_data
+#endif
+       l1_code : ORIGIN = L1_CODE_ORIGIN,          LENGTH = L1_INST_SRAM_SIZE
        l1_data : ORIGIN = L1_DATA_B_SRAM,          LENGTH = L1_DATA_B_SRAM_SIZE
 }
 
 ENTRY(_start)
 SECTIONS
 {
-       .text :
+       .text.pre :
        {
                cpu/blackfin/start.o (.text .text.*)
 
                LDS_BOARD_TEXT
+       } >ram_code
 
-               __initcode_start = .;
+       .text.init :
+       {
                cpu/blackfin/initcode.o (.text .text.*)
-               __initcode_end = .;
+       } >ram_code
+       __initcode_lma = LOADADDR(.text.init);
+       __initcode_len = SIZEOF(.text.init);
 
+       .text :
+       {
                *(.text .text.*)
-       } >ram
+       } >ram_code
 
        .rodata :
        {
                . = ALIGN(4);
-               *(.rodata .rodata.*)
-               *(.rodata1)
-               *(.eh_frame)
+               *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
                . = ALIGN(4);
-       } >ram
+       } >ram_data
 
        .data :
        {
-               . = ALIGN(256);
+               . = ALIGN(4);
                *(.data .data.*)
                *(.data1)
                *(.sdata)
                *(.sdata2)
                *(.dynamic)
                CONSTRUCTORS
-       } >ram
+       } >ram_data
 
        .u_boot_cmd :
        {
                ___u_boot_cmd_start = .;
                *(.u_boot_cmd)
                ___u_boot_cmd_end = .;
-       } >ram
+       } >ram_data
 
        .text_l1 :
        {
@@ -105,8 +122,10 @@ SECTIONS
                *(.l1.text)
                . = ALIGN(4);
                __etext_l1 = .;
-       } >l1_code AT>ram
-       __stext_l1_lma = LOADADDR(.text_l1);
+       } >l1_code AT>ram_code
+       __text_l1_lma = LOADADDR(.text_l1);
+       __text_l1_len = SIZEOF(.text_l1);
+       ASSERT (__text_l1_len <= L1_INST_SRAM_SIZE, "L1 text overflow!")
 
        .data_l1 :
        {
@@ -116,17 +135,19 @@ SECTIONS
                *(.l1.bss)
                . = ALIGN(4);
                __edata_l1 = .;
-       } >l1_data AT>ram
-       __sdata_l1_lma = LOADADDR(.data_l1);
+       } >l1_data AT>ram_data
+       __data_l1_lma = LOADADDR(.data_l1);
+       __data_l1_len = SIZEOF(.data_l1);
+       ASSERT (__data_l1_len <= L1_DATA_B_SRAM_SIZE, "L1 data B overflow!")
 
        .bss :
        {
                . = ALIGN(4);
-               __bss_start = .;
                *(.sbss) *(.scommon)
                *(.dynbss)
                *(.bss .bss.*)
                *(COMMON)
-               __bss_end = .;
-       } >ram
+       } >ram_data
+       __bss_vma = ADDR(.bss);
+       __bss_len = SIZEOF(.bss);
 }