summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2015-04-25 06:29:50 +0200
committerLuka Perkov <luka.perkov@sartura.hr>2015-05-05 14:28:29 +0200
commit880b15a37b22ce516b24460e4bbedd9a6b055625 (patch)
tree675e0095653b882b00944e733befa9344bb792b4
parentf7c0ef073d9e6cdfb98ec7b6dd754926b6afc3ea (diff)
downloadtalos-obmc-uboot-880b15a37b22ce516b24460e4bbedd9a6b055625.tar.gz
talos-obmc-uboot-880b15a37b22ce516b24460e4bbedd9a6b055625.zip
arm: mvebu: Move CONFIG_SPL_LDSCRIPT to common header
This way, new MVEBU boards don't need to specifiy the common location for the SPL linker script. Signed-off-by: Stefan Roese <sr@denx.de> Tested-by: Kevin Smith <kevin.smith@elecsyscorp.com> Tested-by: Dirk Eibach <dirk.eibach@gdsys.cc>
-rw-r--r--arch/arm/mach-mvebu/include/mach/config.h5
-rw-r--r--include/configs/db-mv784mp-gp.h1
-rw-r--r--include/configs/maxbcm.h1
3 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/mach-mvebu/include/mach/config.h b/arch/arm/mach-mvebu/include/mach/config.h
index 86a0aed769..b326ec08ed 100644
--- a/arch/arm/mach-mvebu/include/mach/config.h
+++ b/arch/arm/mach-mvebu/include/mach/config.h
@@ -85,4 +85,9 @@
#define CONFIG_SYS_I2C_SPEED 100000
#endif
+/* Common SPL configuration */
+#ifndef CONFIG_SPL_LDSCRIPT
+#define CONFIG_SPL_LDSCRIPT "arch/arm/mach-mvebu/u-boot-spl.lds"
+#endif
+
#endif /* __MVEBU_CONFIG_H */
diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h
index cfeeab5996..897f473f0c 100644
--- a/include/configs/db-mv784mp-gp.h
+++ b/include/configs/db-mv784mp-gp.h
@@ -100,7 +100,6 @@
#define CONFIG_SPL_LIBGENERIC_SUPPORT
#define CONFIG_SPL_SERIAL_SUPPORT
#define CONFIG_SPL_I2C_SUPPORT
-#define CONFIG_SPL_LDSCRIPT "arch/arm/mach-mvebu/u-boot-spl.lds"
/* SPL related SPI defines */
#define CONFIG_SPL_SPI_SUPPORT
diff --git a/include/configs/maxbcm.h b/include/configs/maxbcm.h
index 27ea71fe61..a0ff067d1d 100644
--- a/include/configs/maxbcm.h
+++ b/include/configs/maxbcm.h
@@ -100,7 +100,6 @@
#define CONFIG_SPL_LIBGENERIC_SUPPORT
#define CONFIG_SPL_SERIAL_SUPPORT
#define CONFIG_SPL_I2C_SUPPORT
-#define CONFIG_SPL_LDSCRIPT "arch/arm/mach-mvebu/u-boot-spl.lds"
/* SPL related SPI defines */
#define CONFIG_SPL_SPI_SUPPORT
OpenPOWER on IntegriCloud