diff options
| author | Mike Frysinger <vapier.adi@gmail.com> | 2008-08-13 10:16:11 +0200 |
|---|---|---|
| committer | Bryan Wu <cooloney@kernel.org> | 2008-08-13 10:16:11 +0200 |
| commit | 07aa7be5708afb3d9afa68f6f853c98e51bc64b3 (patch) | |
| tree | 808fe87c382fb0a1b9432c75989da81f7f9efdd1 /arch/blackfin/kernel/vmlinux.lds.S | |
| parent | Blackfin arch: unify the duplicated portions of __start and split mach-specif... (diff) | |
| download | linux-07aa7be5708afb3d9afa68f6f853c98e51bc64b3.tar.xz linux-07aa7be5708afb3d9afa68f6f853c98e51bc64b3.zip | |
Blackfin arch: convert L2 defines to be the same as the L1 defines
Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Diffstat (limited to 'arch/blackfin/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/blackfin/kernel/vmlinux.lds.S | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/blackfin/kernel/vmlinux.lds.S b/arch/blackfin/kernel/vmlinux.lds.S index d062597e6217..7d12c6692a65 100644 --- a/arch/blackfin/kernel/vmlinux.lds.S +++ b/arch/blackfin/kernel/vmlinux.lds.S @@ -102,7 +102,7 @@ SECTIONS #if !L1_DATA_B_LENGTH *(.l1.data.B) #endif -#ifndef L2_LENGTH +#if !L2_LENGTH . = ALIGN(32); *(.data_l2.cacheline_aligned) *(.l2.data) @@ -212,20 +212,19 @@ SECTIONS __ebss_b_l1 = .; } -#ifdef L2_LENGTH __l2_lma_start = .; .text_data_l2 L2_START : AT(LOADADDR(.data_b_l1) + SIZEOF(.data_b_l1)) { . = ALIGN(4); __stext_l2 = .; - *(.l1.text) + *(.l2.text) . = ALIGN(4); __etext_l2 = .; . = ALIGN(4); __sdata_l2 = .; - *(.l1.data) + *(.l2.data) __edata_l2 = .; . = ALIGN(32); @@ -233,11 +232,10 @@ SECTIONS . = ALIGN(4); __sbss_l2 = .; - *(.l1.bss) + *(.l2.bss) . = ALIGN(4); __ebss_l2 = .; } -#endif /* Force trailing alignment of our init section so that when we * free our init memory, we don't leave behind a partial page. |