Clean config headers by moving CONFIG_SYS_DA850_PLL_INIT away to a Kconfig file.
Signed-off-by: Fabien Parent fparent@baylibre.com ---
v1 -> v3 * New patch
--- 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 5d1c5c5..ffb9a45 100644 --- a/arch/arm/mach-davinci/Kconfig +++ b/arch/arm/mach-davinci/Kconfig @@ -7,10 +7,12 @@ choice config TARGET_IPAM390 bool "IPAM390 board" select SUPPORT_SPL + select SYS_DA850_PLL_INIT
config TARGET_DA850EVM bool "DA850 EVM board" select SUPPORT_SPL + select SYS_DA850_PLL_INIT
config TARGET_EA20 bool "EA20 board" @@ -21,15 +23,20 @@ config TARGET_OMAPL138_LCDK
config TARGET_CALIMAIN bool "Calimain board" + select SYS_DA850_PLL_INIT
config TARGET_LEGOEV3 bool "LEGO MINDSTORMS EV3" + select SYS_DA850_PLL_INIT
endchoice
config SYS_SOC default "davinci"
+config SYS_DA850_PLL_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 bf173ff..41c8eb5 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_PLL_INIT #define CONFIG_SYS_DA850_DDR_INIT #define CONFIG_ARCH_CPU_INIT #define CONFIG_DA8XX_GPIO diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 3560115..1f3b003 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_PLL_INIT #define CONFIG_SYS_DA850_DDR_INIT
#ifdef CONFIG_DIRECT_NOR_BOOT diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h index 381fe04..13c9d56 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_PLL_INIT #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 d91e75d..adb2446 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_PLL_INIT #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 d0b5e7f..60795ee 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4778,7 +4778,6 @@ CONFIG_SYS_DA850_PLL1_PLLDIV2 CONFIG_SYS_DA850_PLL1_PLLDIV3 CONFIG_SYS_DA850_PLL1_PLLM CONFIG_SYS_DA850_PLL1_POSTDIV -CONFIG_SYS_DA850_PLL_INIT CONFIG_SYS_DA850_SYSCFG_SUSPSRC CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1