From 1be5983fe17a18b5ac36c8c3cbcf1fb39ae3bd0f Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 3 Nov 2009 11:41:47 +0000 Subject: =?UTF-8?q?2009-11-03=09Ralf=20Cors=C3=A9pius=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * configure.ac: Add RTEMS_BSP_LINKCMDS. * make/custom/csb637.cfg: Remove LDFLAGS. Remove RTEMS_LINKCMDS. * startup/linkcmds: Remove (Rename into linkcmds.csb337). * startup/linkcmds.csb337: New (Renamed from linkcmds). * Makefile.am: Rework linkcmds handling. --- c/src/lib/libbsp/arm/csb337/ChangeLog | 8 + c/src/lib/libbsp/arm/csb337/Makefile.am | 5 +- c/src/lib/libbsp/arm/csb337/configure.ac | 1 + c/src/lib/libbsp/arm/csb337/make/custom/csb637.cfg | 3 - c/src/lib/libbsp/arm/csb337/preinstall.am | 6 +- c/src/lib/libbsp/arm/csb337/startup/linkcmds | 232 --------------------- .../lib/libbsp/arm/csb337/startup/linkcmds.csb337 | 232 +++++++++++++++++++++ 7 files changed, 245 insertions(+), 242 deletions(-) delete mode 100644 c/src/lib/libbsp/arm/csb337/startup/linkcmds create mode 100644 c/src/lib/libbsp/arm/csb337/startup/linkcmds.csb337 (limited to 'c/src/lib/libbsp') diff --git a/c/src/lib/libbsp/arm/csb337/ChangeLog b/c/src/lib/libbsp/arm/csb337/ChangeLog index a5a767a90d..2b781afa82 100644 --- a/c/src/lib/libbsp/arm/csb337/ChangeLog +++ b/c/src/lib/libbsp/arm/csb337/ChangeLog @@ -1,3 +1,11 @@ +2009-11-03 Ralf Corsépius + + * configure.ac: Add RTEMS_BSP_LINKCMDS. + * make/custom/csb637.cfg: Remove LDFLAGS. Remove RTEMS_LINKCMDS. + * startup/linkcmds: Remove (Rename into linkcmds.csb337). + * startup/linkcmds.csb337: New (Renamed from linkcmds). + * Makefile.am: Rework linkcmds handling. + 2009-10-21 Ralf Corsépius * make/custom/csb337.cfg: Remove RTEMS_BSP_FAMILY. diff --git a/c/src/lib/libbsp/arm/csb337/Makefile.am b/c/src/lib/libbsp/arm/csb337/Makefile.am index f0bd90d05d..43b4853141 100644 --- a/c/src/lib/libbsp/arm/csb337/Makefile.am +++ b/c/src/lib/libbsp/arm/csb337/Makefile.am @@ -38,8 +38,9 @@ noinst_LIBRARIES = libbspstart.a libbspstart_a_SOURCES = start/start.S project_lib_DATA = start.$(OBJEXT) -dist_project_lib_DATA += startup/linkcmds -dist_project_lib_DATA += startup/linkcmds.csb637 +project_lib_DATA += startup/linkcmds +EXTRA_DIST = startup/linkcmds.csb337 +EXTRA_DIST += startup/linkcmds.csb637 noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = diff --git a/c/src/lib/libbsp/arm/csb337/configure.ac b/c/src/lib/libbsp/arm/csb337/configure.ac index 0c49af3fff..3aeaa7c94f 100644 --- a/c/src/lib/libbsp/arm/csb337/configure.ac +++ b/c/src/lib/libbsp/arm/csb337/configure.ac @@ -35,6 +35,7 @@ RTEMS_BSPOPTS_HELP([ENABLE_UMON_CONSOLE], AM_CONDITIONAL(ENABLE_LCD,test "$ENABLE_UMON_CONSOLE" = "1") RTEMS_BSP_CLEANUP_OPTIONS(1, 1) +RTEMS_BSP_LINKCMDS # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile]) diff --git a/c/src/lib/libbsp/arm/csb337/make/custom/csb637.cfg b/c/src/lib/libbsp/arm/csb337/make/custom/csb637.cfg index df48d337bd..ffcb1b0483 100644 --- a/c/src/lib/libbsp/arm/csb337/make/custom/csb637.cfg +++ b/c/src/lib/libbsp/arm/csb337/make/custom/csb637.cfg @@ -4,7 +4,4 @@ # $Id$ # -RTEMS_LINKCMDS=linkcmds.csb637 -LDFLAGS += -qnolinkcmds -T $(RTEMS_LINKCMDS) - include $(RTEMS_ROOT)/make/custom/csb337.cfg diff --git a/c/src/lib/libbsp/arm/csb337/preinstall.am b/c/src/lib/libbsp/arm/csb337/preinstall.am index f92b20d3a1..78fb8f1f9b 100644 --- a/c/src/lib/libbsp/arm/csb337/preinstall.am +++ b/c/src/lib/libbsp/arm/csb337/preinstall.am @@ -102,9 +102,5 @@ TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT) $(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds - -$(PROJECT_LIB)/linkcmds.csb637: startup/linkcmds.csb637 $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.csb637 -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.csb637 +TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds diff --git a/c/src/lib/libbsp/arm/csb337/startup/linkcmds b/c/src/lib/libbsp/arm/csb337/startup/linkcmds deleted file mode 100644 index abc9658357..0000000000 --- a/c/src/lib/libbsp/arm/csb337/startup/linkcmds +++ /dev/null @@ -1,232 +0,0 @@ -/* - * Cogent CSB337 Linker script - * - * Copyright (c) 2004 by Jay Monkman - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * - * http://www.rtems.com/license/LICENSE. - * - * - * $Id$ - */ - -OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm", - "elf32-littlearm") -OUTPUT_ARCH(arm) -ENTRY(_start) - -MEMORY -{ - sdram : ORIGIN = 0x20100000, LENGTH = 15M - sram : ORIGIN = 0x00200000, LENGTH = 16K -} - -/* - * Declare some sizes. - */ -_sdram_base = DEFINED(_sdram_base) ? _sdram_base : 0x20100000; -_sdram_size = DEFINED(_sdram_size) ? _sdram_size : 15M; - -RamBase = _sdram_base; -RamSize = _sdram_size; -HeapSize = DEFINED(HeapSize) ? HeapSize : 0x0; - -_sram_base = DEFINED(_sram_base) ? _sram_base : 0x00000000; -_sram_size = DEFINED(_sram_size) ? _sram_size : 16K; - -_irq_stack_size = DEFINED(_irq_stack_size) ? _irq_stack_size : 0x1000; -_fiq_stack_size = DEFINED(_fiq_stack_size) ? _fiq_stack_size : 0x400; -_abt_stack_size = DEFINED(_abt_stack_size) ? _abt_stack_size : 0x100; -_svc_stack_size = DEFINED(_svc_stack_size) ? _svc_stack_size : 0x1000; - - - -/* Do we need any of these for elf? - __DYNAMIC = 0; */ - -SECTIONS -{ - .base : - { - _sram_base = .; - - /* reserve room for the vectors and function pointers */ - arm_exception_table = .; - . += 64; - - /* 256 byte aligned rx buffer header array */ - . = ALIGN (0x100); - at91rm9200_emac_rxbuf_hdrs = .; - - /* 1 transmit buffer, 0x600 size */ - . += (0x100); - at91rm9200_emac_txbuf = .; - . += (0x600); - - /* 8 receive buffers, 0x600 each */ - at91rm9200_emac_rxbufs = .; - . += (0x600 * 8); - - } > sram - - .text : - { - _text_start = .; - CREATE_OBJECT_SYMBOLS - *(.text) - *(.text.*) - - /* - * Special FreeBSD sysctl sections. - */ - . = ALIGN (16); - __start_set_sysctl_set = .; - *(set_sysctl_*); - __stop_set_sysctl_set = ABSOLUTE(.); - *(set_domain_*); - *(set_pseudo_*); - - /* .gnu.warning sections are handled specially by elf32.em. */ - *(.gnu.warning) - *(.gnu.linkonce.t*) - *(.glue_7) - *(.glue_7t) - - /* I think these come from the ld docs: */ - ___CTOR_LIST__ = .; - LONG((___CTOR_END__ - ___CTOR_LIST__) / 4 - 2) - *(.ctors) - LONG(0) - ___CTOR_END__ = .; - ___DTOR_LIST__ = .; - LONG((___DTOR_END__ - ___DTOR_LIST__) / 4 - 2) - *(.dtors) - LONG(0) - ___DTOR_END__ = .; - - _etext = .; - PROVIDE (etext = .); - } > sdram - - .init : - { - KEEP (*(.init)) - } > sdram /*=0*/ - - .fini : - { - KEEP (*(.fini)) - } > sdram /*=0*/ - - .data : - { - *(.data) - *(.data.*) - *(.gnu.linkonce.d*) - *(.jcr) - SORT(CONSTRUCTORS) - _edata = .; - } > sdram - - .eh_frame : { *(.eh_frame) } > sdram - .data1 : { *(.data1) } > sdram - .eh_frame : { *(.eh_frame) } > sdram - .gcc_except_table : { *(.gcc_except_table*) } > sdram - - .rodata : - { - *(.rodata) - *(.rodata.*) - *(.gnu.linkonce.r*) - } > sdram - - .bss : - { - _bss_start_ = .; - _clear_start = .; - *(.bss) - *(.bss.*) - *(.gnu.linkonce.b.*) - *(COMMON) - . = ALIGN(64); - _clear_end = .; - - . = ALIGN (256); - _abt_stack = .; - . += _abt_stack_size; - - . = ALIGN (256); - _irq_stack = .; - . += _irq_stack_size; - - . = ALIGN (256); - _fiq_stack = .; - . += _fiq_stack_size; - - . = ALIGN (256); - _svc_stack = .; - . += _svc_stack_size; - - _bss_end_ = .; - _end = .; - __end = .; - -/* - * Ideally, the MMU's translation table would be in SRAM. But we need - * 16K which is the size of SRAM. If we do the mapping right, the TLB - * should be big enough that to hold all the translations that matter, - * so keeping the table in SDRAM won't be a problem. - */ - . = ALIGN (16 * 1024); - _ttbl_base = .; - . += (16 * 1024); - - - . = ALIGN (1024); - _bss_free_start = .; - WorkAreaBase = .; - - } > sdram - - -/* Debugging stuff follows? */ - - /* Stabs debugging sections. */ - .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) } - /* DWARF debug sections. - Symbols in the DWARF debugging sections are relative to the beginning - of the section so we begin them at 0. */ - /* DWARF 1 */ - .debug 0 : { *(.debug) } - .line 0 : { *(.line) } - /* GNU DWARF 1 extensions */ - .debug_srcinfo 0 : { *(.debug_srcinfo) } - .debug_sfnames 0 : { *(.debug_sfnames) } - /* DWARF 1.1 and DWARF 2 */ - .debug_aranges 0 : { *(.debug_aranges) } - .debug_pubnames 0 : { *(.debug_pubnames) } - /* DWARF 2 */ - .debug_info 0 : { *(.debug_info) } - .debug_abbrev 0 : { *(.debug_abbrev) } - .debug_line 0 : { *(.debug_line) } - .debug_frame 0 : { *(.debug_frame) } - .debug_str 0 : { *(.debug_str) } - .debug_loc 0 : { *(.debug_loc) } - .debug_macinfo 0 : { *(.debug_macinfo) } - /* SGI/MIPS DWARF 2 extensions */ - .debug_weaknames 0 : { *(.debug_weaknames) } - .debug_funcnames 0 : { *(.debug_funcnames) } - .debug_typenames 0 : { *(.debug_typenames) } - .debug_varnames 0 : { *(.debug_varnames) } -/* .stack 0x80000 : { _stack = .; *(.stack) }*/ - /* These must appear regardless of . */ -} - diff --git a/c/src/lib/libbsp/arm/csb337/startup/linkcmds.csb337 b/c/src/lib/libbsp/arm/csb337/startup/linkcmds.csb337 new file mode 100644 index 0000000000..abc9658357 --- /dev/null +++ b/c/src/lib/libbsp/arm/csb337/startup/linkcmds.csb337 @@ -0,0 +1,232 @@ +/* + * Cogent CSB337 Linker script + * + * Copyright (c) 2004 by Jay Monkman + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * + * http://www.rtems.com/license/LICENSE. + * + * + * $Id$ + */ + +OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm", + "elf32-littlearm") +OUTPUT_ARCH(arm) +ENTRY(_start) + +MEMORY +{ + sdram : ORIGIN = 0x20100000, LENGTH = 15M + sram : ORIGIN = 0x00200000, LENGTH = 16K +} + +/* + * Declare some sizes. + */ +_sdram_base = DEFINED(_sdram_base) ? _sdram_base : 0x20100000; +_sdram_size = DEFINED(_sdram_size) ? _sdram_size : 15M; + +RamBase = _sdram_base; +RamSize = _sdram_size; +HeapSize = DEFINED(HeapSize) ? HeapSize : 0x0; + +_sram_base = DEFINED(_sram_base) ? _sram_base : 0x00000000; +_sram_size = DEFINED(_sram_size) ? _sram_size : 16K; + +_irq_stack_size = DEFINED(_irq_stack_size) ? _irq_stack_size : 0x1000; +_fiq_stack_size = DEFINED(_fiq_stack_size) ? _fiq_stack_size : 0x400; +_abt_stack_size = DEFINED(_abt_stack_size) ? _abt_stack_size : 0x100; +_svc_stack_size = DEFINED(_svc_stack_size) ? _svc_stack_size : 0x1000; + + + +/* Do we need any of these for elf? + __DYNAMIC = 0; */ + +SECTIONS +{ + .base : + { + _sram_base = .; + + /* reserve room for the vectors and function pointers */ + arm_exception_table = .; + . += 64; + + /* 256 byte aligned rx buffer header array */ + . = ALIGN (0x100); + at91rm9200_emac_rxbuf_hdrs = .; + + /* 1 transmit buffer, 0x600 size */ + . += (0x100); + at91rm9200_emac_txbuf = .; + . += (0x600); + + /* 8 receive buffers, 0x600 each */ + at91rm9200_emac_rxbufs = .; + . += (0x600 * 8); + + } > sram + + .text : + { + _text_start = .; + CREATE_OBJECT_SYMBOLS + *(.text) + *(.text.*) + + /* + * Special FreeBSD sysctl sections. + */ + . = ALIGN (16); + __start_set_sysctl_set = .; + *(set_sysctl_*); + __stop_set_sysctl_set = ABSOLUTE(.); + *(set_domain_*); + *(set_pseudo_*); + + /* .gnu.warning sections are handled specially by elf32.em. */ + *(.gnu.warning) + *(.gnu.linkonce.t*) + *(.glue_7) + *(.glue_7t) + + /* I think these come from the ld docs: */ + ___CTOR_LIST__ = .; + LONG((___CTOR_END__ - ___CTOR_LIST__) / 4 - 2) + *(.ctors) + LONG(0) + ___CTOR_END__ = .; + ___DTOR_LIST__ = .; + LONG((___DTOR_END__ - ___DTOR_LIST__) / 4 - 2) + *(.dtors) + LONG(0) + ___DTOR_END__ = .; + + _etext = .; + PROVIDE (etext = .); + } > sdram + + .init : + { + KEEP (*(.init)) + } > sdram /*=0*/ + + .fini : + { + KEEP (*(.fini)) + } > sdram /*=0*/ + + .data : + { + *(.data) + *(.data.*) + *(.gnu.linkonce.d*) + *(.jcr) + SORT(CONSTRUCTORS) + _edata = .; + } > sdram + + .eh_frame : { *(.eh_frame) } > sdram + .data1 : { *(.data1) } > sdram + .eh_frame : { *(.eh_frame) } > sdram + .gcc_except_table : { *(.gcc_except_table*) } > sdram + + .rodata : + { + *(.rodata) + *(.rodata.*) + *(.gnu.linkonce.r*) + } > sdram + + .bss : + { + _bss_start_ = .; + _clear_start = .; + *(.bss) + *(.bss.*) + *(.gnu.linkonce.b.*) + *(COMMON) + . = ALIGN(64); + _clear_end = .; + + . = ALIGN (256); + _abt_stack = .; + . += _abt_stack_size; + + . = ALIGN (256); + _irq_stack = .; + . += _irq_stack_size; + + . = ALIGN (256); + _fiq_stack = .; + . += _fiq_stack_size; + + . = ALIGN (256); + _svc_stack = .; + . += _svc_stack_size; + + _bss_end_ = .; + _end = .; + __end = .; + +/* + * Ideally, the MMU's translation table would be in SRAM. But we need + * 16K which is the size of SRAM. If we do the mapping right, the TLB + * should be big enough that to hold all the translations that matter, + * so keeping the table in SDRAM won't be a problem. + */ + . = ALIGN (16 * 1024); + _ttbl_base = .; + . += (16 * 1024); + + + . = ALIGN (1024); + _bss_free_start = .; + WorkAreaBase = .; + + } > sdram + + +/* Debugging stuff follows? */ + + /* Stabs debugging sections. */ + .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) } + /* DWARF debug sections. + Symbols in the DWARF debugging sections are relative to the beginning + of the section so we begin them at 0. */ + /* DWARF 1 */ + .debug 0 : { *(.debug) } + .line 0 : { *(.line) } + /* GNU DWARF 1 extensions */ + .debug_srcinfo 0 : { *(.debug_srcinfo) } + .debug_sfnames 0 : { *(.debug_sfnames) } + /* DWARF 1.1 and DWARF 2 */ + .debug_aranges 0 : { *(.debug_aranges) } + .debug_pubnames 0 : { *(.debug_pubnames) } + /* DWARF 2 */ + .debug_info 0 : { *(.debug_info) } + .debug_abbrev 0 : { *(.debug_abbrev) } + .debug_line 0 : { *(.debug_line) } + .debug_frame 0 : { *(.debug_frame) } + .debug_str 0 : { *(.debug_str) } + .debug_loc 0 : { *(.debug_loc) } + .debug_macinfo 0 : { *(.debug_macinfo) } + /* SGI/MIPS DWARF 2 extensions */ + .debug_weaknames 0 : { *(.debug_weaknames) } + .debug_funcnames 0 : { *(.debug_funcnames) } + .debug_typenames 0 : { *(.debug_typenames) } + .debug_varnames 0 : { *(.debug_varnames) } +/* .stack 0x80000 : { _stack = .; *(.stack) }*/ + /* These must appear regardless of . */ +} + -- cgit v1.2.3