@@ -29,7 +29,6 @@
#define CONFIG_SAMSUNG /* in a SAMSUNG core */
#define CONFIG_S5P /* S5P Family */
#define CONFIG_EXYNOS5 /* which is in a Exynos5 Family */
-#define CONFIG_SMDK5250 /* which is in a SMDK5250 */
#include <asm/arch/cpu.h> /* get chip and board defs */
@@ -73,7 +72,6 @@
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (4 << 20))
/* select serial console configuration */
-#define CONFIG_SERIAL3 /* use SERIAL 3 */
#define CONFIG_BAUDRATE 115200
#define EXYNOS5_DEFAULT_UART_OFFSET 0x010000
@@ -132,8 +130,6 @@
#define CONFIG_SPL
#define COPY_BL2_FNPTR_ADDR 0x02020030
-/* specific .lds file */
-#define CONFIG_SPL_LDSCRIPT "board/samsung/smdk5250/smdk5250-uboot-spl.lds"
#define CONFIG_SPL_TEXT_BASE 0x02023400
#define CONFIG_SPL_MAX_SIZE (14 * 1024)
@@ -142,7 +138,7 @@
/* Miscellaneous configurable options */
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */
-#define CONFIG_SYS_PROMPT "SMDK5250 # "
+#define CONFIG_SYS_PROMPT "EXYNOS5250 # "
#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
#define CONFIG_SYS_PBSIZE 384 /* Print Buffer Size */
#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
@@ -182,7 +178,6 @@
/* FLASH and environment organization */
#define CONFIG_SYS_NO_FLASH
#undef CONFIG_CMD_IMLS
-#define CONFIG_IDENT_STRING " for SMDK5250"
#define CONFIG_SYS_MMC_ENV_DEV 0
@@ -242,7 +237,6 @@
#define CONFIG_PMIC_MAX77686
/* SPI */
-#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_SPI_FLASH
#ifdef CONFIG_SPI_FLASH
@@ -25,9 +25,17 @@
#ifndef __CONFIG_SMDK_H
#define __CONFIG_SMDK_H
-#include <configs/exynos5250-dt.h>
-
#undef CONFIG_DEFAULT_DEVICE_TREE
#define CONFIG_DEFAULT_DEVICE_TREE exynos5250-smdk5250
+#define CONFIG_SMDK5250 /* which is in a SMDK5250 */
+#define CONFIG_SERIAL3 /* use SERIAL 3 */
+
+/* specific .lds file */
+#define CONFIG_SPL_LDSCRIPT "board/samsung/smdk5250/smdk5250-uboot-spl.lds"
+#define CONFIG_IDENT_STRING " for SMDK5250"
+#define CONFIG_ENV_IS_IN_SPI_FLASH
+
+#include <configs/exynos5250-dt.h>
+
#endif /* __CONFIG_SMDK_H */
@@ -25,9 +25,17 @@
#ifndef __CONFIG_SNOW_H
#define __CONFIG_SNOW_H
-#include <configs/exynos5250-dt.h>
-
#undef CONFIG_DEFAULT_DEVICE_TREE
#define CONFIG_DEFAULT_DEVICE_TREE exynos5250-snow
+#define CONFIG_SMDK5250 /* which is in a SMDK5250 */
+#define CONFIG_SERIAL3 /* use SERIAL 3 */
+
+/* specific .lds file */
+#define CONFIG_SPL_LDSCRIPT "board/samsung/smdk5250/smdk5250-uboot-spl.lds"
+#define CONFIG_IDENT_STRING " for SMDK5250"
+#define CONFIG_ENV_IS_IN_SPI_FLASH
+
+#include <configs/exynos5250-dt.h>
+
#endif /* __CONFIG_SNOW_H */
Not all boards based on exynos5250 have SPI flash, same serial port and might not require the same lds script. Hence move them to board specific config file Signed-off-by: Inderpal Singh <inderpal.singh@linaro.org> --- include/configs/exynos5250-dt.h | 8 +------- include/configs/smdk5250.h | 12 ++++++++++-- include/configs/snow.h | 12 ++++++++++-- 3 files changed, 21 insertions(+), 11 deletions(-)