[PATCH 2/3] bsps/powerpc: Rename BSP specific linkcmds.base

Sebastian Huber sebastian.huber at embedded-brains.de
Wed Jan 3 12:01:48 UTC 2018 

Avoid name conflicts with shared linkcmds.base.

Update #3254.
---
 c/src/lib/libbsp/powerpc/gen5200/Makefile.am                        | 2 +-
 c/src/lib/libbsp/powerpc/gen5200/preinstall.am                      | 6 +++---
 c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.brs5l             | 2 +-
 c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.brs6l             | 2 +-
 c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.dp2               | 2 +-
 .../gen5200/startup/{linkcmds.base => linkcmds.gen5200_base}        | 0
 c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.icecube           | 2 +-
 c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.pm520_cr825       | 2 +-
 c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.pm520_ze30        | 2 +-
 c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am                         | 2 +-
 c/src/lib/libbsp/powerpc/tqm8xx/preinstall.am                       | 6 +++---
 c/src/lib/libbsp/powerpc/tqm8xx/startup/linkcmds.tqm8xx             | 2 +-
 .../powerpc/tqm8xx/startup/{linkcmds.base => linkcmds.tqm8xx_base}  | 0
 13 files changed, 15 insertions(+), 15 deletions(-)
 rename c/src/lib/libbsp/powerpc/gen5200/startup/{linkcmds.base => linkcmds.gen5200_base} (100%)
 rename c/src/lib/libbsp/powerpc/tqm8xx/startup/{linkcmds.base => linkcmds.tqm8xx_base} (100%)

diff --git a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
index 19b4312205..3110518f21 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
@@ -32,7 +32,7 @@ rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA += rtems_crti.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds.base
+dist_project_lib_DATA += startup/linkcmds.gen5200_base
 project_lib_DATA += startup/linkcmds
 EXTRA_DIST += startup/linkcmds.brs5l
 EXTRA_DIST += startup/linkcmds.brs6l
diff --git a/c/src/lib/libbsp/powerpc/gen5200/preinstall.am b/c/src/lib/libbsp/powerpc/gen5200/preinstall.am
index 382b283794..b6b203150d 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/preinstall.am
+++ b/c/src/lib/libbsp/powerpc/gen5200/preinstall.am
@@ -85,9 +85,9 @@ $(PROJECT_LIB)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirst
 	$(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
 TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
 
-$(PROJECT_LIB)/linkcmds.base: startup/linkcmds.base $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.base
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.base
+$(PROJECT_LIB)/linkcmds.gen5200_base: startup/linkcmds.gen5200_base $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.gen5200_base
+PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.gen5200_base
 
 $(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
diff --git a/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.brs5l b/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.brs5l
index 944cc36f4d..58407e5f56 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.brs5l
+++ b/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.brs5l
@@ -12,4 +12,4 @@ MEMORY {
 	REGS : ORIGIN = 0xf0000000, LENGTH = 64k
 }
 
-INCLUDE linkcmds.base
+INCLUDE linkcmds.gen5200_base
diff --git a/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.brs6l b/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.brs6l
index 3563f49f11..ae80a72ad5 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.brs6l
+++ b/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.brs6l
@@ -12,4 +12,4 @@ MEMORY {
 	REGS : ORIGIN = 0xf0000000, LENGTH = 64k
 }
 
-INCLUDE linkcmds.base
+INCLUDE linkcmds.gen5200_base
diff --git a/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.dp2 b/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.dp2
index 398919ae8c..4ad76d6fce 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.dp2
+++ b/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.dp2
@@ -12,4 +12,4 @@ MEMORY {
 	DPRAM : ORIGIN = 0x0, LENGTH = 0
 }
 
-INCLUDE linkcmds.base
+INCLUDE linkcmds.gen5200_base
diff --git a/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.base b/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.gen5200_base
similarity index 100%
rename from c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.base
rename to c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.gen5200_base
diff --git a/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.icecube b/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.icecube
index 17c707fb49..c05d45a852 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.icecube
+++ b/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.icecube
@@ -12,4 +12,4 @@ MEMORY {
 	DPRAM : ORIGIN = 0x0, LENGTH = 0
 }
 
-INCLUDE linkcmds.base
+INCLUDE linkcmds.gen5200_base
diff --git a/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.pm520_cr825 b/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.pm520_cr825
index 55b987695c..49d596b577 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.pm520_cr825
+++ b/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.pm520_cr825
@@ -12,4 +12,4 @@ MEMORY {
 	DPRAM : ORIGIN = 0xff000000, LENGTH = 1k
 }
 
-INCLUDE linkcmds.base
+INCLUDE linkcmds.gen5200_base
diff --git a/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.pm520_ze30 b/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.pm520_ze30
index 55b987695c..49d596b577 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.pm520_ze30
+++ b/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.pm520_ze30
@@ -12,4 +12,4 @@ MEMORY {
 	DPRAM : ORIGIN = 0xff000000, LENGTH = 1k
 }
 
-INCLUDE linkcmds.base
+INCLUDE linkcmds.gen5200_base
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
index a804b9244c..5b21dc1b7a 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
@@ -34,7 +34,7 @@ rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
 project_lib_DATA += rtems_crti.$(OBJEXT)
 
 project_lib_DATA += startup/linkcmds
-dist_project_lib_DATA += startup/linkcmds.base
+dist_project_lib_DATA += startup/linkcmds.tqm8xx_base
 EXTRA_DIST += startup/linkcmds.tqm8xx
 
 noinst_LIBRARIES = libbsp.a
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/preinstall.am b/c/src/lib/libbsp/powerpc/tqm8xx/preinstall.am
index 49cc79ac51..5b27200561 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/preinstall.am
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/preinstall.am
@@ -89,7 +89,7 @@ $(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
 TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
 
-$(PROJECT_LIB)/linkcmds.base: startup/linkcmds.base $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.base
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.base
+$(PROJECT_LIB)/linkcmds.tqm8xx_base: startup/linkcmds.tqm8xx_base $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.tqm8xx_base
+PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.tqm8xx_base
 
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/startup/linkcmds.tqm8xx b/c/src/lib/libbsp/powerpc/tqm8xx/startup/linkcmds.tqm8xx
index a830b687e5..0c651c41d5 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/startup/linkcmds.tqm8xx
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/startup/linkcmds.tqm8xx
@@ -13,4 +13,4 @@ MEMORY {
 	ROM : ORIGIN = 0x40000000, LENGTH = 8M
 }
 
-INCLUDE linkcmds.base
+INCLUDE linkcmds.tqm8xx_base
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/startup/linkcmds.base b/c/src/lib/libbsp/powerpc/tqm8xx/startup/linkcmds.tqm8xx_base
similarity index 100%
rename from c/src/lib/libbsp/powerpc/tqm8xx/startup/linkcmds.base
rename to c/src/lib/libbsp/powerpc/tqm8xx/startup/linkcmds.tqm8xx_base
-- 
2.12.3

More information about the devel mailing list