diff options
Diffstat (limited to '')
10 files changed, 22 insertions, 57 deletions
diff --git a/c/src/lib/libbsp/arm/lpc24xx/ChangeLog b/c/src/lib/libbsp/arm/lpc24xx/ChangeLog index d9016b11d8..eaec880a3a 100644 --- a/c/src/lib/libbsp/arm/lpc24xx/ChangeLog +++ b/c/src/lib/libbsp/arm/lpc24xx/ChangeLog @@ -1,3 +1,14 @@ +2009-11-03 Ralf Corsépius <ralf.corsepius@rtems.org> + + * configure.ac: Add RTEMS_BSP_LINKCMDS. + * make/custom/lpc24xx.inc: Remove LDFLAGS. + * make/custom/lpc24xx_ea.cfg: Remove LPC24XX_LINKCMDS. + * make/custom/lpc24xx_ncs_ram.cfg: Remove LPC24XX_LINKCMDS. + * make/custom/lpc24xx_ncs_rom_ext.cfg: Remove LPC24XX_LINKCMDS. + * make/custom/lpc24xx_ncs_rom_int.cfg: Remove LPC24XX_LINKCMDS. + * startup/linkcmds: Remove. + * Makefile.am: Rework linkcmds handling. + 2009-10-22 Ralf Corsépius <ralf.corsepius@rtems.org> * clock/clock-config.c, misc/dma.c, network/network.c, diff --git a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am index 6a864dfa1a..ebc63e766a 100644 --- a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am +++ b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am @@ -55,12 +55,12 @@ libbspstart_a_SOURCES = ../shared/start/start.S project_lib_DATA = start.$(OBJEXT) -dist_project_lib_DATA += ../shared/startup/linkcmds.base \ - startup/linkcmds \ - startup/linkcmds.lpc24xx_ea \ - startup/linkcmds.lpc24xx_ncs_rom_int \ - startup/linkcmds.lpc24xx_ncs_rom_ext \ - startup/linkcmds.lpc24xx_ncs_ram +project_lib_DATA += startup/linkcmds +project_lib_DATA += ../shared/startup/linkcmds.base +EXTRA_DIST = startup/linkcmds.lpc24xx_ea +EXTRA_DIST += startup/linkcmds.lpc24xx_ncs_rom_int +EXTRA_DIST += startup/linkcmds.lpc24xx_ncs_rom_ext +EXTRA_DIST += startup/linkcmds.lpc24xx_ncs_ram ############################################################################### # LibBSP # diff --git a/c/src/lib/libbsp/arm/lpc24xx/configure.ac b/c/src/lib/libbsp/arm/lpc24xx/configure.ac index a310bcfbed..fc7202c2bd 100644 --- a/c/src/lib/libbsp/arm/lpc24xx/configure.ac +++ b/c/src/lib/libbsp/arm/lpc24xx/configure.ac @@ -70,6 +70,7 @@ RTEMS_BSPOPTS_SET([BSP_START_RESET_VECTOR],[lpc24xx_ncs_rom_ext],[0x80000040]) RTEMS_BSPOPTS_HELP([BSP_START_RESET_VECTOR],[reset vector address for BSP start]) RTEMS_BSP_CLEANUP_OPTIONS(0, 0) +RTEMS_BSP_LINKCMDS AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx.inc b/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx.inc index d5146a3c8b..e2018939a9 100644 --- a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx.inc +++ b/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx.inc @@ -11,5 +11,3 @@ RTEMS_CPU = arm CPU_CFLAGS = -mcpu=arm7tdmi-s -mstructure-size-boundary=8 -mthumb CFLAGS_OPTIMIZE_V = -Os -g - -LDFLAGS += -qnolinkcmds -T $(LPC24XX_LINKCMDS) diff --git a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx_ea.cfg b/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx_ea.cfg index 41a455799c..5905a0a221 100644 --- a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx_ea.cfg +++ b/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx_ea.cfg @@ -4,8 +4,6 @@ # $Id$ # -LPC24XX_LINKCMDS = linkcmds.lpc24xx_ea - include $(RTEMS_ROOT)/make/custom/lpc24xx.inc # define bsp-post-link diff --git a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx_ncs_ram.cfg b/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx_ncs_ram.cfg index 62205c1df4..009b661134 100644 --- a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx_ncs_ram.cfg +++ b/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx_ncs_ram.cfg @@ -4,6 +4,4 @@ # $Id$ # -LPC24XX_LINKCMDS = linkcmds.lpc24xx_ncs_ram - include $(RTEMS_ROOT)/make/custom/lpc24xx.inc diff --git a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx_ncs_rom_ext.cfg b/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx_ncs_rom_ext.cfg index 96fbe1c670..009b661134 100644 --- a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx_ncs_rom_ext.cfg +++ b/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx_ncs_rom_ext.cfg @@ -4,6 +4,4 @@ # $Id$ # -LPC24XX_LINKCMDS = linkcmds.lpc24xx_ncs_rom_ext - include $(RTEMS_ROOT)/make/custom/lpc24xx.inc diff --git a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx_ncs_rom_int.cfg b/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx_ncs_rom_int.cfg index cc62417ed3..009b661134 100644 --- a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx_ncs_rom_int.cfg +++ b/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc24xx_ncs_rom_int.cfg @@ -4,6 +4,4 @@ # $Id$ # -LPC24XX_LINKCMDS = linkcmds.lpc24xx_ncs_rom_int - include $(RTEMS_ROOT)/make/custom/lpc24xx.inc diff --git a/c/src/lib/libbsp/arm/lpc24xx/preinstall.am b/c/src/lib/libbsp/arm/lpc24xx/preinstall.am index f30dd34f48..44a43b974b 100644 --- a/c/src/lib/libbsp/arm/lpc24xx/preinstall.am +++ b/c/src/lib/libbsp/arm/lpc24xx/preinstall.am @@ -121,27 +121,11 @@ $(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT) TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT) -$(PROJECT_LIB)/linkcmds.base: ../shared/startup/linkcmds.base $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.base -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.base - $(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds - -$(PROJECT_LIB)/linkcmds.lpc24xx_ea: startup/linkcmds.lpc24xx_ea $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.lpc24xx_ea -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.lpc24xx_ea +TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds -$(PROJECT_LIB)/linkcmds.lpc24xx_ncs_rom_int: startup/linkcmds.lpc24xx_ncs_rom_int $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.lpc24xx_ncs_rom_int -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.lpc24xx_ncs_rom_int - -$(PROJECT_LIB)/linkcmds.lpc24xx_ncs_rom_ext: startup/linkcmds.lpc24xx_ncs_rom_ext $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.lpc24xx_ncs_rom_ext -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.lpc24xx_ncs_rom_ext - -$(PROJECT_LIB)/linkcmds.lpc24xx_ncs_ram: startup/linkcmds.lpc24xx_ncs_ram $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.lpc24xx_ncs_ram -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.lpc24xx_ncs_ram +$(PROJECT_LIB)/linkcmds.base: ../shared/startup/linkcmds.base $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.base +PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.base diff --git a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds b/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds deleted file mode 100644 index cab8310661..0000000000 --- a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds +++ /dev/null @@ -1,21 +0,0 @@ -MEMORY { - RAM_INT (AIW) : ORIGIN = 0x40000000, LENGTH = 64k - RAM_EXT (AIW) : ORIGIN = 0xa0000000, LENGTH = 32M - NIRVANA : ORIGIN = 0, LENGTH = 0 -} - -REGION_ALIAS ("REGION_START", RAM_EXT); -REGION_ALIAS ("REGION_VECTOR", RAM_INT); -REGION_ALIAS ("REGION_TEXT", RAM_EXT); -REGION_ALIAS ("REGION_TEXT_LOAD", RAM_EXT); -REGION_ALIAS ("REGION_RODATA", RAM_EXT); -REGION_ALIAS ("REGION_RODATA_LOAD", RAM_EXT); -REGION_ALIAS ("REGION_DATA", RAM_EXT); -REGION_ALIAS ("REGION_DATA_LOAD", RAM_EXT); -REGION_ALIAS ("REGION_FAST", RAM_INT); -REGION_ALIAS ("REGION_FAST_LOAD", RAM_EXT); -REGION_ALIAS ("REGION_BSS", RAM_EXT); -REGION_ALIAS ("REGION_WORK", RAM_EXT); -REGION_ALIAS ("REGION_STACK", RAM_INT); - -INCLUDE linkcmds.base |