[U-Boot] [PATCH 1/2] sparc: merge LEON3 linker scripts

Masahiro Yamada yamada.m at jp.panasonic.com
Fri Jun 20 07:58:21 CEST 2014


The linker scripts of LEON3

 - board/gaisler/grsim/u-boot.lds
 - board/gaisler/gr_cpci_ax2000/u-boot.lds
 - board/gaisler/gr_ep2s60/u-boot.lds
 - board/gaisler/gr_xc3s_1500/u-boot.lds

are the same (except cosmetic differences such as indentation).

This commit merges them into arch/sparc/cpu/leon3/u-boot.lds.

Signed-off-by: Masahiro Yamada <yamada.m at jp.panasonic.com>
Cc: Daniel Hellstrom <daniel at gaisler.com>
---

 .../grsim => arch/sparc/cpu/leon3}/u-boot.lds      |   0
 board/gaisler/gr_cpci_ax2000/u-boot.lds            | 143 --------------------
 board/gaisler/gr_ep2s60/u-boot.lds                 | 143 --------------------
 board/gaisler/gr_xc3s_1500/u-boot.lds              | 145 ---------------------
 4 files changed, 431 deletions(-)
 rename {board/gaisler/grsim => arch/sparc/cpu/leon3}/u-boot.lds (100%)
 delete mode 100644 board/gaisler/gr_cpci_ax2000/u-boot.lds
 delete mode 100644 board/gaisler/gr_ep2s60/u-boot.lds
 delete mode 100644 board/gaisler/gr_xc3s_1500/u-boot.lds

diff --git a/board/gaisler/grsim/u-boot.lds b/arch/sparc/cpu/leon3/u-boot.lds
similarity index 100%
rename from board/gaisler/grsim/u-boot.lds
rename to arch/sparc/cpu/leon3/u-boot.lds
diff --git a/board/gaisler/gr_cpci_ax2000/u-boot.lds b/board/gaisler/gr_cpci_ax2000/u-boot.lds
deleted file mode 100644
index 6d9c90c..0000000
--- a/board/gaisler/gr_cpci_ax2000/u-boot.lds
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Linker script for Gaisler Research AB's GR-CPCI-AX2000 board
- * with template design.
- *
- * (C) Copyright 2008
- * Daniel Hellstrom, Gaisler Research, daniel at gaisler.com.
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-OUTPUT_FORMAT("elf32-sparc", "elf32-sparc", "elf32-sparc")
-OUTPUT_ARCH(sparc)
-ENTRY(_start)
-SECTIONS
-{
-
-/* Read-only sections, merged into text segment: */
-	. = + SIZEOF_HEADERS;
-	.interp : { *(.interp) }
-	.hash          : { *(.hash)		}
-	.dynsym        : { *(.dynsym)		}
-	.dynstr        : { *(.dynstr)		}
-	.rel.text      : { *(.rel.text)		}
-	.rela.text     : { *(.rela.text)	}
-	.rel.data      : { *(.rel.data)		}
-	.rela.data     : { *(.rela.data)	}
-	.rel.rodata    : { *(.rel.rodata)	}
-	.rela.rodata   : { *(.rela.rodata)	}
-	.rel.got       : { *(.rel.got)		}
-	.rela.got      : { *(.rela.got)		}
-	.rel.ctors     : { *(.rel.ctors)	}
-	.rela.ctors    : { *(.rela.ctors)	}
-	.rel.dtors     : { *(.rel.dtors)	}
-	.rela.dtors    : { *(.rela.dtors)	}
-	.rel.bss       : { *(.rel.bss)		}
-	.rela.bss      : { *(.rela.bss)		}
-	.rel.plt       : { *(.rel.plt)		}
-	.rela.plt      : { *(.rela.plt)		}
-	.init          : { *(.init)		}
-	.plt : { *(.plt) }
-
-	.text : {
-		_load_addr = .;
-		_text = .;
-
-		*(.start)
-		arch/sparc/cpu/leon3/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,
- * no global data accesses please.
- */
-		__prom_start = .;
-		*(.prom.pgt)
-		*(.prom.data)
-		*(.prom.text)
-		. = ALIGN(16);
-		__prom_end = .;
-		*(.text)
-		*(.fixup)
-		*(.gnu.warning)
-/*		*(.got1)*/
-		. = ALIGN(16);
-		*(.eh_frame)
-		*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
-	}
-	. = ALIGN(4);
-	_etext = .;
-
-	/* CMD Table */
-
-
-	. = ALIGN(4);
-	.u_boot_list : {
-		KEEP(*(SORT(.u_boot_list*)));
-	}
-
-	.data	:
-	{
-		*(.data)
-		*(.data1)
-		*(.data.rel)
-		*(.data.rel.*)
-		*(.sdata)
-		*(.sdata2)
-		*(.dynamic)
-		CONSTRUCTORS
-	}
-	_edata	=	.;
-	PROVIDE (edata = .);
-
-	. = ALIGN(4);
-	__got_start = .;
-	.got : {
-		*(.got)
-/*		*(.data.rel)
-		*(.data.rel.local)*/
-		. = ALIGN(16);
-	}
-	__got_end = .;
-
-/*	.data.rel : { } */
-
-	. = ALIGN(4096);
-	__init_begin = .;
-	.text.init : { *(.text.init) }
-	.data.init : { *(.data.init) }
-	. = ALIGN(4096);
-	__init_end = .;
-
-	__bss_start = .;
-	.bss		:
-	{
-	 *(.sbss) *(.scommon)
-	 *(.dynbss)
-	 *(.bss)
-	 *(COMMON)
-	. = ALIGN(16); /* to speed clearing of bss up */
-	}
-	__bss_end = . ;
-	__bss_end = . ;
-	PROVIDE (end = .);
-
-/* Relocated into main memory */
-
-	/* Start of main memory */
-	/*. = 0x40000000;*/
-
-	.stack (NOLOAD)	: { *(.stack) }
-
-	/* PROM CODE */
-
-	/* global data in RAM passed to kernel after booting */
-
-  .stab 0		: { *(.stab) }
-  .stabstr 0		: { *(.stabstr) }
-  .stab.excl 0		: { *(.stab.excl) }
-  .stab.exclstr 0	: { *(.stab.exclstr) }
-  .stab.index 0		: { *(.stab.index) }
-  .stab.indexstr 0	: { *(.stab.indexstr) }
-  .comment 0		: { *(.comment) }
-
-}
diff --git a/board/gaisler/gr_ep2s60/u-boot.lds b/board/gaisler/gr_ep2s60/u-boot.lds
deleted file mode 100644
index 973603c..0000000
--- a/board/gaisler/gr_ep2s60/u-boot.lds
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Linker script for Gaisler Research AB's Template design
- * for Altera NIOS Development board Stratix II Edition, EP2S60 FPGA.
- *
- * (C) Copyright 2008
- * Daniel Hellstrom, Gaisler Research, daniel at gaisler.com.
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-OUTPUT_FORMAT("elf32-sparc", "elf32-sparc", "elf32-sparc")
-OUTPUT_ARCH(sparc)
-ENTRY(_start)
-SECTIONS
-{
-
-/* Read-only sections, merged into text segment: */
-	. = + SIZEOF_HEADERS;
-	.interp : { *(.interp) }
-	.hash          : { *(.hash)		}
-	.dynsym        : { *(.dynsym)		}
-	.dynstr        : { *(.dynstr)		}
-	.rel.text      : { *(.rel.text)		}
-	.rela.text     : { *(.rela.text)	}
-	.rel.data      : { *(.rel.data)		}
-	.rela.data     : { *(.rela.data)	}
-	.rel.rodata    : { *(.rel.rodata)	}
-	.rela.rodata   : { *(.rela.rodata)	}
-	.rel.got       : { *(.rel.got)		}
-	.rela.got      : { *(.rela.got)		}
-	.rel.ctors     : { *(.rel.ctors)	}
-	.rela.ctors    : { *(.rela.ctors)	}
-	.rel.dtors     : { *(.rel.dtors)	}
-	.rela.dtors    : { *(.rela.dtors)	}
-	.rel.bss       : { *(.rel.bss)		}
-	.rela.bss      : { *(.rela.bss)		}
-	.rel.plt       : { *(.rel.plt)		}
-	.rela.plt      : { *(.rela.plt)		}
-	.init          : { *(.init)		}
-	.plt : { *(.plt) }
-
-	.text : {
-		_load_addr = .;
-		_text = .;
-
-		*(.start)
-		arch/sparc/cpu/leon3/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,
- * no global data accesses please.
- */
-		__prom_start = .;
-		*(.prom.pgt)
-		*(.prom.data)
-		*(.prom.text)
-		. = ALIGN(16);
-		__prom_end = .;
-		*(.text)
-		*(.fixup)
-		*(.gnu.warning)
-/*		*(.got1)*/
-		. = ALIGN(16);
-		*(.eh_frame)
-		*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
-	}
-	. = ALIGN(4);
-	_etext = .;
-
-	/* CMD Table */
-
-
-	. = ALIGN(4);
-	.u_boot_list : {
-		KEEP(*(SORT(.u_boot_list*)));
-	}
-
-	.data	:
-	{
-		*(.data)
-		*(.data1)
-		*(.data.rel)
-		*(.data.rel.*)
-		*(.sdata)
-		*(.sdata2)
-		*(.dynamic)
-		CONSTRUCTORS
-	}
-	_edata	=	.;
-	PROVIDE (edata = .);
-
-	. = ALIGN(4);
-	__got_start = .;
-	.got : {
-		*(.got)
-/*		*(.data.rel)
-		*(.data.rel.local)*/
-		. = ALIGN(16);
-	}
-	__got_end = .;
-
-/*	.data.rel : { } */
-
-	. = ALIGN(4096);
-	__init_begin = .;
-	.text.init : { *(.text.init) }
-	.data.init : { *(.data.init) }
-	. = ALIGN(4096);
-	__init_end = .;
-
-	__bss_start = .;
-	.bss		:
-	{
-	 *(.sbss) *(.scommon)
-	 *(.dynbss)
-	 *(.bss)
-	 *(COMMON)
-	. = ALIGN(16); /* to speed clearing of bss up */
-	}
-	__bss_end = . ;
-	__bss_end = . ;
-	PROVIDE (end = .);
-
-/* Relocated into main memory */
-
-	/* Start of main memory */
-	/*. = 0x40000000;*/
-
-	.stack (NOLOAD)	: { *(.stack) }
-
-	/* PROM CODE */
-
-	/* global data in RAM passed to kernel after booting */
-
-  .stab 0		: { *(.stab) }
-  .stabstr 0		: { *(.stabstr) }
-  .stab.excl 0		: { *(.stab.excl) }
-  .stab.exclstr 0	: { *(.stab.exclstr) }
-  .stab.index 0		: { *(.stab.index) }
-  .stab.indexstr 0	: { *(.stab.indexstr) }
-  .comment 0		: { *(.comment) }
-
-}
diff --git a/board/gaisler/gr_xc3s_1500/u-boot.lds b/board/gaisler/gr_xc3s_1500/u-boot.lds
deleted file mode 100644
index 1ed71f2..0000000
--- a/board/gaisler/gr_xc3s_1500/u-boot.lds
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Linker script for Gaisler Research AB's GR-XC3S-1500 board
- * with template design.
- *
- * (C) Copyright 2007
- * Daniel Hellstrom, Gaisler Research, daniel at gaisler.com.
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-OUTPUT_FORMAT("elf32-sparc", "elf32-sparc", "elf32-sparc")
-OUTPUT_ARCH(sparc)
-ENTRY(_start)
-SECTIONS
-{
-
-/* Read-only sections, merged into text segment: */
-	. = + SIZEOF_HEADERS;
-	.interp : { *(.interp) }
-	.hash          : { *(.hash)		}
-	.dynsym        : { *(.dynsym)		}
-	.dynstr        : { *(.dynstr)		}
-	.rel.text      : { *(.rel.text)		}
-	.rela.text     : { *(.rela.text)	}
-	.rel.data      : { *(.rel.data)		}
-	.rela.data     : { *(.rela.data)	}
-	.rel.rodata    : { *(.rel.rodata)	}
-	.rela.rodata   : { *(.rela.rodata)	}
-	.rel.got       : { *(.rel.got)		}
-	.rela.got      : { *(.rela.got)		}
-	.rel.ctors     : { *(.rel.ctors)	}
-	.rela.ctors    : { *(.rela.ctors)	}
-	.rel.dtors     : { *(.rel.dtors)	}
-	.rela.dtors    : { *(.rela.dtors)	}
-	.rel.bss       : { *(.rel.bss)		}
-	.rela.bss      : { *(.rela.bss)		}
-	.rel.plt       : { *(.rel.plt)		}
-	.rela.plt      : { *(.rela.plt)		}
-	.init          : { *(.init)		}
-	.plt : { *(.plt) }
-
-	.text : {
-		_load_addr = .;
-		_text = .;
-
-		*(.start)
-		arch/sparc/cpu/leon3/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,
- * no global data accesses please.
- */
-		__prom_start = .;
-		*(.prom.pgt)
-		*(.prom.data)
-		*(.prom.text)
-		. = ALIGN(16);
-		__prom_end = .;
-		*(.text)
-		*(.fixup)
-		*(.gnu.warning)
-/*		*(.got1)*/
-		. = ALIGN(16);
-		*(.eh_frame)
-		*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
-	}
-	. = ALIGN(4);
-	_etext = .;
-
-	/* CMD Table */
-
-
-	. = ALIGN(4);
-	.u_boot_list : {
-		KEEP(*(SORT(.u_boot_list*)));
-	}
-
-	.data	:
-	{
-		*(.data)
-		*(.data1)
-		*(.data.rel)
-		*(.data.rel.*)
-		*(.sdata)
-		*(.sdata2)
-		*(.dynamic)
-		CONSTRUCTORS
-	}
-	_edata	=	.;
-	PROVIDE (edata = .);
-
-	. = ALIGN(4);
-	__got_start = .;
-	.got : {
-		*(.got)
-/*		*(.data.rel)
-		*(.data.rel.local)*/
-		. = ALIGN(16);
-	}
-	__got_end = .;
-
-/*	.data.rel : { } */
-
-
-	. = ALIGN(4096);
-	__init_begin = .;
-	.text.init : { *(.text.init) }
-	.data.init : { *(.data.init) }
-	. = ALIGN(4096);
-	__init_end = .;
-
-	__bss_start = .;
-	.bss		:
-	{
-	 *(.sbss) *(.scommon)
-	 *(.dynbss)
-	 *(.bss)
-	 *(COMMON)
-	. = ALIGN(16); /* to speed clearing of bss up */
-	}
-	__bss_end = . ;
-	__bss_end = . ;
-	PROVIDE (end = .);
-
-/* Relocated into main memory */
-
-	/* Start of main memory */
-	/*. = 0x40000000;*/
-
-	.stack (NOLOAD)	: { *(.stack) }
-
-	/* PROM CODE */
-
-	/* global data in RAM passed to kernel after booting */
-
-
-  .stab 0		: { *(.stab) }
-  .stabstr 0		: { *(.stabstr) }
-  .stab.excl 0		: { *(.stab.excl) }
-  .stab.exclstr 0	: { *(.stab.exclstr) }
-  .stab.index 0		: { *(.stab.index) }
-  .stab.indexstr 0	: { *(.stab.indexstr) }
-  .comment 0		: { *(.comment) }
-
-}
-- 
1.9.1



More information about the U-Boot mailing list