diff options
| author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2014-06-20 14:58:22 +0900 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-07-22 07:44:24 -0400 |
| commit | 9d78b9ae8d39f59875607976dbdce0f6f31ed41c (patch) | |
| tree | 680d579208ddca383ecdddf6d527075aac9cf955 /arch/sparc | |
| parent | 9f847b82019e14068337a6928755b05f7fae8b85 (diff) | |
| download | blackbird-obmc-uboot-9d78b9ae8d39f59875607976dbdce0f6f31ed41c.tar.gz blackbird-obmc-uboot-9d78b9ae8d39f59875607976dbdce0f6f31ed41c.zip | |
sparc: merge LEON2 and LEON3 linker scripts
There is only one line diff between LEON2 and LEON3 linker scripts:
- arch/sparc/cpu/leon2/start.o (.text)
+ arch/sparc/cpu/leon3/start.o (.text)
They can be written in the same way:
*/start.o (.text)
So, board/gaisler/grsim_leon2/u-boot.lds
and arch/sparc/cpu/leon3/u-boot.lds
can be merged into arch/sparc/cpu/u-boot.lds.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Daniel Hellstrom <daniel@gaisler.com>
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/cpu/u-boot.lds (renamed from arch/sparc/cpu/leon3/u-boot.lds) | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/sparc/cpu/leon3/u-boot.lds b/arch/sparc/cpu/u-boot.lds index cdc83941ed..1ade3b344b 100644 --- a/arch/sparc/cpu/leon3/u-boot.lds +++ b/arch/sparc/cpu/u-boot.lds @@ -1,7 +1,5 @@ /* - * Linker script for Gaisler Research AB's GRSIM LEON3 simulator. - * - * (C) Copyright 2007 + * (C) Copyright 2007-2008 * Daniel Hellstrom, Gaisler Research, daniel@gaisler.com. * * SPDX-License-Identifier: GPL-2.0+ @@ -43,7 +41,7 @@ SECTIONS _text = .; *(.start) - arch/sparc/cpu/leon3/start.o (.text) + */start.o (.text) /* 8k is the same as the PROM offset from end of main memory, (CONFIG_SYS_PROM_SIZE) */ . = ALIGN(8192); /* PROM CODE, Will be relocated to the end of memory, |
