From 8a02ec1dc671f452a57fb934f13a0e4e9ae269b8 Mon Sep 17 00:00:00 2001 From: Stefan Roese Date: Wed, 18 Nov 2015 12:44:29 +0100 Subject: [PATCH] arm: mvebu: Move some defines to common include file This patch moves some config options to the mvebu common include file. Making it easier to not forget these defines for new boards. Signed-off-by: Stefan Roese Cc: Luka Perkov Cc: Dirk Eibach --- arch/arm/mach-mvebu/include/mach/config.h | 6 ++++++ include/configs/db-88f6820-gp.h | 5 ----- include/configs/db-mv784mp-gp.h | 3 --- include/configs/maxbcm.h | 3 --- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/arch/arm/mach-mvebu/include/mach/config.h b/arch/arm/mach-mvebu/include/mach/config.h index 74a1ff6ad7..c282fcbfcb 100644 --- a/arch/arm/mach-mvebu/include/mach/config.h +++ b/arch/arm/mach-mvebu/include/mach/config.h @@ -23,6 +23,12 @@ #define CONFIG_SYS_CACHELINE_SIZE 32 +#define CONFIG_SYS_L2_PL310 + +#ifdef CONFIG_SPL_BUILD +#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ +#endif + /* * By default kwbimage.cfg from board specific folder is used * If for some board, different configuration file need to be used, diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h index a6ecba3bd1..d76ceb72b0 100644 --- a/include/configs/db-88f6820-gp.h +++ b/include/configs/db-88f6820-gp.h @@ -14,11 +14,6 @@ #define CONFIG_ARMADA_38X #define CONFIG_DB_88F6820_GP /* Board target name for DDR training */ -#define CONFIG_SYS_L2_PL310 - -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ -#endif #define CONFIG_DISPLAY_BOARDINFO_LATE /* diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h index 6c3f444743..886f313aad 100644 --- a/include/configs/db-mv784mp-gp.h +++ b/include/configs/db-mv784mp-gp.h @@ -13,9 +13,6 @@ #define CONFIG_ARMADA_XP /* SOC Family Name */ #define CONFIG_DB_784MP_GP /* Board target name for DDR training */ -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ -#endif #define CONFIG_DISPLAY_BOARDINFO_LATE /* diff --git a/include/configs/maxbcm.h b/include/configs/maxbcm.h index ada5267d34..49e83c0fc6 100644 --- a/include/configs/maxbcm.h +++ b/include/configs/maxbcm.h @@ -11,9 +11,6 @@ * High Level Configuration Options (easy to change) */ #define CONFIG_ARMADA_XP /* SOC Family Name */ -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ -#endif #define CONFIG_DISPLAY_BOARDINFO_LATE /* -- 2.39.5