From b31bf37a38a6cc4a0b358563d2b04680f198d3b9 Mon Sep 17 00:00:00 2001 From: Fabien Parent <fparent@baylibre.com> Date: Tue, 29 Nov 2016 14:23:37 +0100 Subject: [PATCH] ARM: davinci: Move CONFIG_SYS_DA850_DDR_INIT to Kconfig Clean config headers by moving CONFIG_SYS_DA850_DDR_INIT away to a Kconfig file. Signed-off-by: Fabien Parent <fparent@baylibre.com> Reviewed-by: Tom Rini <trini@konsulko.com> --- arch/arm/mach-davinci/Kconfig | 7 +++++++ include/configs/calimain.h | 1 - include/configs/da850evm.h | 1 - include/configs/ipam390.h | 1 - include/configs/legoev3.h | 1 - scripts/config_whitelist.txt | 1 - 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig index ffb9a45475..cf4ee166a5 100644 --- a/arch/arm/mach-davinci/Kconfig +++ b/arch/arm/mach-davinci/Kconfig @@ -8,11 +8,13 @@ config TARGET_IPAM390 bool "IPAM390 board" select SUPPORT_SPL select SYS_DA850_PLL_INIT + select SYS_DA850_DDR_INIT config TARGET_DA850EVM bool "DA850 EVM board" select SUPPORT_SPL select SYS_DA850_PLL_INIT + select SYS_DA850_DDR_INIT config TARGET_EA20 bool "EA20 board" @@ -24,10 +26,12 @@ config TARGET_OMAPL138_LCDK config TARGET_CALIMAIN bool "Calimain board" select SYS_DA850_PLL_INIT + select SYS_DA850_DDR_INIT config TARGET_LEGOEV3 bool "LEGO MINDSTORMS EV3" select SYS_DA850_PLL_INIT + select SYS_DA850_DDR_INIT endchoice @@ -37,6 +41,9 @@ config SYS_SOC config SYS_DA850_PLL_INIT bool +config SYS_DA850_DDR_INIT + bool + source "board/Barix/ipam390/Kconfig" source "board/davinci/da8xxevm/Kconfig" source "board/davinci/ea20/Kconfig" diff --git a/include/configs/calimain.h b/include/configs/calimain.h index 41c8eb5f33..dab4ec2aac 100644 --- a/include/configs/calimain.h +++ b/include/configs/calimain.h @@ -32,7 +32,6 @@ #define CONFIG_SYS_HZ_CLOCK clk_get(DAVINCI_AUXCLK_CLKID) #define CONFIG_SYS_TEXT_BASE 0x60000000 #define CONFIG_DA850_LOWLEVEL -#define CONFIG_SYS_DA850_DDR_INIT #define CONFIG_ARCH_CPU_INIT #define CONFIG_DA8XX_GPIO #define CONFIG_HW_WATCHDOG diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 1f3b003c25..18a8e26a22 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -31,7 +31,6 @@ #define CONFIG_SYS_OSCIN_FREQ 24000000 #define CONFIG_SYS_TIMERBASE DAVINCI_TIMER0_BASE #define CONFIG_SYS_HZ_CLOCK clk_get(DAVINCI_AUXCLK_CLKID) -#define CONFIG_SYS_DA850_DDR_INIT #ifdef CONFIG_DIRECT_NOR_BOOT #define CONFIG_ARCH_CPU_INIT diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h index 13c9d5619d..991dad1ce3 100644 --- a/include/configs/ipam390.h +++ b/include/configs/ipam390.h @@ -32,7 +32,6 @@ #define CONFIG_SYS_OSCIN_FREQ 24000000 #define CONFIG_SYS_TIMERBASE DAVINCI_TIMER0_BASE #define CONFIG_SYS_HZ_CLOCK clk_get(DAVINCI_AUXCLK_CLKID) -#define CONFIG_SYS_DA850_DDR_INIT #define CONFIG_SYS_TEXT_BASE 0xc1080000 /* diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h index adb2446e70..f2f82acc99 100644 --- a/include/configs/legoev3.h +++ b/include/configs/legoev3.h @@ -26,7 +26,6 @@ #define CONFIG_SYS_OSCIN_FREQ 24000000 #define CONFIG_SYS_TIMERBASE DAVINCI_TIMER0_BASE #define CONFIG_SYS_HZ_CLOCK clk_get(DAVINCI_AUXCLK_CLKID) -#define CONFIG_SYS_DA850_DDR_INIT #define CONFIG_SYS_TEXT_BASE 0xc1080000 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index dae2c99763..a08d90ece4 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4690,7 +4690,6 @@ CONFIG_SYS_DA850_DDR2_SDBCR2 CONFIG_SYS_DA850_DDR2_SDRCR CONFIG_SYS_DA850_DDR2_SDTIMR CONFIG_SYS_DA850_DDR2_SDTIMR2 -CONFIG_SYS_DA850_DDR_INIT CONFIG_SYS_DA850_PLL0_PLLDIV1 CONFIG_SYS_DA850_PLL0_PLLDIV2 CONFIG_SYS_DA850_PLL0_PLLDIV3 -- 2.39.5