1 files changed, 25 insertions, 29 deletions

diff --git a/arch/blackfin/kernel/vmlinux.lds.S b/arch/blackfin/kernel/vmlinux.lds.S
index cb01a9de2680..3ecc64cab3be 100644
--- a/arch/blackfin/kernel/vmlinux.lds.S
+++ b/arch/blackfin/kernel/vmlinux.lds.S
@@ -56,6 +56,10 @@ SECTIONS
                 *(.text.*)
                 *(.fixup)
 
+#if !L1_CODE_LENGTH
+                *(.l1.text)
+#endif
+
                 . = ALIGN(16);
                 ___start___ex_table = .;
                 *(__ex_table)
@@ -73,6 +77,12 @@ SECTIONS
                 ___bss_start = .;
                 *(.bss .bss.*)
                 *(COMMON)
+#if !L1_DATA_A_LENGTH
+                *(.l1.bss)
+#endif
+#if !L1_DATA_B_LENGTH
+                *(.l1.bss.B)
+#endif
                 ___bss_stop = .;
         }
 
@@ -83,6 +93,15 @@ SECTIONS
                 . = ALIGN(32);
                 *(.data.cacheline_aligned)
 
+#if !L1_DATA_A_LENGTH
+                . = ALIGN(32);
+                *(.data_l1.cacheline_aligned)
+                *(.l1.data)
+#endif
+#if !L1_DATA_B_LENGTH
+                *(.l1.data.B)
+#endif
+
                 DATA_DATA
                 *(.data.*)
                 CONSTRUCTORS
@@ -147,64 +166,43 @@ SECTIONS
 
         __l1_lma_start = .;
 
-#if L1_CODE_LENGTH
-# define LDS_L1_CODE *(.l1.text)
-#else
-# define LDS_L1_CODE
-#endif
         .text_l1 L1_CODE_START : AT(LOADADDR(.init.ramfs) + SIZEOF(.init.ramfs))
         {
                 . = ALIGN(4);
                 __stext_l1 = .;
-                LDS_L1_CODE
+                *(.l1.text)
                 . = ALIGN(4);
                 __etext_l1 = .;
         }
 
-#if L1_DATA_A_LENGTH
-# define LDS_L1_A_DATA  *(.l1.data)
-# define LDS_L1_A_BSS   *(.l1.bss)
-# define LDS_L1_A_CACHE *(.data_l1.cacheline_aligned)
-#else
-# define LDS_L1_A_DATA
-# define LDS_L1_A_BSS
-# define LDS_L1_A_CACHE
-#endif
         .data_l1 L1_DATA_A_START : AT(LOADADDR(.text_l1) + SIZEOF(.text_l1))
         {
                 . = ALIGN(4);
                 __sdata_l1 = .;
-                LDS_L1_A_DATA
+                *(.l1.data)
                 __edata_l1 = .;
 
                 . = ALIGN(4);
                 __sbss_l1 = .;
-                LDS_L1_A_BSS
+                *(.l1.bss)
 
                 . = ALIGN(32);
-                LDS_L1_A_CACHE
+                *(.data_l1.cacheline_aligned)
 
                 . = ALIGN(4);
                 __ebss_l1 = .;
         }
 
-#if L1_DATA_B_LENGTH
-# define LDS_L1_B_DATA  *(.l1.data.B)
-# define LDS_L1_B_BSS   *(.l1.bss.B)
-#else
-# define LDS_L1_B_DATA
-# define LDS_L1_B_BSS
-#endif
         .data_b_l1 L1_DATA_B_START : AT(LOADADDR(.data_l1) + SIZEOF(.data_l1))
         {
                 . = ALIGN(4);
                 __sdata_b_l1 = .;
-                LDS_L1_B_DATA
+                *(.l1.data.B)
                 __edata_b_l1 = .;
 
                 . = ALIGN(4);
                 __sbss_b_l1 = .;
-                LDS_L1_B_BSS
+                *(.l1.bss.B)
 
                 . = ALIGN(4);
                 __ebss_b_l1 = .;
@@ -223,8 +221,6 @@ SECTIONS
 
         DWARF_DEBUG
 
-        NOTES
-
         /DISCARD/ :
         {
                 EXIT_TEXT