asm-generic/signal.h: import from linux

[u-boot] / lib_blackfin / u-boot.lds.S

diff --git a/lib_blackfin/u-boot.lds.S b/lib_blackfin/u-boot.lds.S
index 8a9e8b1c2be75370f4b6dfd3183e74c21928c08a..3be341fad0f327713d33344213ccf8bafe7448fc 100644 (file)
--- a/lib_blackfin/u-boot.lds.S
+++ b/lib_blackfin/u-boot.lds.S
@@ -57,7 +57,14 @@ OUTPUT_ARCH(bfin)
 
 MEMORY
 {
+#if CONFIG_MEM_SIZE
        ram     : ORIGIN = CONFIG_SYS_MONITOR_BASE, LENGTH = CONFIG_SYS_MONITOR_LEN
+# 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
 }
@@ -82,16 +89,14 @@ SECTIONS
        .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 :
        {
@@ -102,14 +107,14 @@ SECTIONS
                *(.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 :
        {
@@ -118,7 +123,7 @@ SECTIONS
                *(.l1.text)
                . = ALIGN(4);
                __etext_l1 = .;
-       } >l1_code AT>ram
+       } >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!")
@@ -131,7 +136,7 @@ SECTIONS
                *(.l1.bss)
                . = ALIGN(4);
                __edata_l1 = .;
-       } >l1_data AT>ram
+       } >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!")
@@ -143,7 +148,7 @@ SECTIONS
                *(.dynbss)
                *(.bss .bss.*)
                *(COMMON)
-       } >ram
+       } >ram_data
        __bss_vma = ADDR(.bss);
        __bss_len = SIZEOF(.bss);
 }