[PATCH 02/19] arch/MPC5xxx: use a mach specific linker script instead of a board specific one

Juergen Borleis jbe at pengutronix.de
Tue Oct 7 07:22:01 PDT 2014


For easier maintenance in the future.

Signed-off-by: Juergen Borleis <jbe at pengutronix.de>
---
 arch/ppc/Makefile                                      | 5 -----
 arch/ppc/boards/pcm030/Makefile                        | 1 -
 arch/ppc/mach-mpc5xxx/Makefile                         | 1 +
 arch/ppc/{boards/pcm030 => mach-mpc5xxx}/barebox.lds.S | 0
 4 files changed, 1 insertion(+), 6 deletions(-)
 rename arch/ppc/{boards/pcm030 => mach-mpc5xxx}/barebox.lds.S (100%)

diff --git a/arch/ppc/Makefile b/arch/ppc/Makefile
index fb9b0b8..d0dd51e 100644
--- a/arch/ppc/Makefile
+++ b/arch/ppc/Makefile
@@ -64,9 +64,4 @@ endif
 
 common-y += $(BOARD) $(CPU) $(MACH)
 common-y += arch/ppc/lib/
-
-ifdef CONFIG_MPC85xx
 lds-y += $(MACH)/barebox.lds
-else
-lds-y += $(BOARD)/barebox.lds
-endif
diff --git a/arch/ppc/boards/pcm030/Makefile b/arch/ppc/boards/pcm030/Makefile
index e7d744b..3749605 100644
--- a/arch/ppc/boards/pcm030/Makefile
+++ b/arch/ppc/boards/pcm030/Makefile
@@ -1,2 +1 @@
 obj-y += pcm030.o
-extra-y += barebox.lds
diff --git a/arch/ppc/mach-mpc5xxx/Makefile b/arch/ppc/mach-mpc5xxx/Makefile
index c532a6d..bf8d68d 100644
--- a/arch/ppc/mach-mpc5xxx/Makefile
+++ b/arch/ppc/mach-mpc5xxx/Makefile
@@ -5,6 +5,7 @@ obj-y				+= speed.o
 obj-y				+= traps.o
 obj-y				+= time.o
 extra-y				+= start.o
+extra-y				+= barebox.lds
 obj-$(CONFIG_MPC5200)		+= firmware_sc_task_bestcomm.impl.o
 obj-$(CONFIG_REGINFO)		+= reginfo.o
 
diff --git a/arch/ppc/boards/pcm030/barebox.lds.S b/arch/ppc/mach-mpc5xxx/barebox.lds.S
similarity index 100%
rename from arch/ppc/boards/pcm030/barebox.lds.S
rename to arch/ppc/mach-mpc5xxx/barebox.lds.S
-- 
2.1.0




More information about the barebox mailing list