ARM: davinci: Move CONFIG_SYS_DA850_PLL_INIT to Kconfig

Clean config headers by moving CONFIG_SYS_DA850_PLL_INIT away to a
Kconfig file.

Signed-off-by: Fabien Parent <fparent@baylibre.com>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig
index 5d1c5c5ccb1faff90f9a5304dac86261037a796a..ffb9a45475fbdbd3d406f4f11f3a38d06e76738c 100644 (file)
--- 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 bf173ff084336c1c2c591703565bf74b9b9d4659..41c8eb5f3339ca4a72ec5cdc04b22acbaceefe3f 100644 (file)
--- 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 35601159ddefb1e4957d4cc97c6ead8de91e729e..1f3b003c2519da58f7256cdd0054126faa226f01 100644 (file)
--- 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 381fe04aeaff66aa4254d7fb94ff85db6b6f4c56..13c9d5619d82262c3e01248eab5ebb2542fdc4ab 100644 (file)
--- 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 d91e75dd3fda665f6b5fb655a1e6e1041884d511..adb2446e7077779e5ded89baca01b330791f5a9a 100644 (file)
--- 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 0cb1321de15990b9f2edd75a2081677e905fcb54..dae2c99763b6e35ba3efee664c7487d0edf32054 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -4706,7 +4706,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