diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-11-03 11:41:47 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-11-03 11:41:47 +0000 |
| commit | 1be5983fe17a18b5ac36c8c3cbcf1fb39ae3bd0f (patch) | |
| tree | 8366cb139619920851d51db9f2ff9b613f58d3e0 /c/src/lib | |
| parent | 2009-11-03 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
| download | rtems-1be5983fe17a18b5ac36c8c3cbcf1fb39ae3bd0f.tar.bz2 | |
2009-11-03 Ralf Corsépius <ralf.corsepius@rtems.org>
* 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.
Diffstat (limited to 'c/src/lib')
| -rw-r--r-- | c/src/lib/libbsp/arm/csb337/ChangeLog | 8 | ||||
| -rw-r--r-- | c/src/lib/libbsp/arm/csb337/Makefile.am | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/arm/csb337/configure.ac | 1 | ||||
| -rw-r--r-- | c/src/lib/libbsp/arm/csb337/make/custom/csb637.cfg | 3 | ||||
| -rw-r--r-- | c/src/lib/libbsp/arm/csb337/preinstall.am | 6 | ||||
| -rw-r--r-- | c/src/lib/libbsp/arm/csb337/startup/linkcmds.csb337 (renamed from c/src/lib/libbsp/arm/csb337/startup/linkcmds) | 0 |
6 files changed, 13 insertions, 10 deletions
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 <ralf.corsepius@rtems.org> + + * 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 <ralf.corsepius@rtems.org> * 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.csb337 index abc9658357..abc9658357 100644 --- a/c/src/lib/libbsp/arm/csb337/startup/linkcmds +++ b/c/src/lib/libbsp/arm/csb337/startup/linkcmds.csb337 |