diff options
| author | Fabien Parent <fparent@baylibre.com> | 2016-11-29 14:23:37 +0100 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-12-03 13:21:12 -0500 |
| commit | b31bf37a38a6cc4a0b358563d2b04680f198d3b9 (patch) | |
| tree | 7d1fda4b109522eabd6f1fe8875db77b7e27bd8e | |
| parent | f519b3649156ee6d7945f7003cf8934bd9b39f1e (diff) | |
| download | u-boot-b31bf37a38a6cc4a0b358563d2b04680f198d3b9.zip u-boot-b31bf37a38a6cc4a0b358563d2b04680f198d3b9.tar.gz u-boot-b31bf37a38a6cc4a0b358563d2b04680f198d3b9.tar.bz2 | |
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>
| -rw-r--r-- | arch/arm/mach-davinci/Kconfig | 7 | ||||
| -rw-r--r-- | include/configs/calimain.h | 1 | ||||
| -rw-r--r-- | include/configs/da850evm.h | 1 | ||||
| -rw-r--r-- | include/configs/ipam390.h | 1 | ||||
| -rw-r--r-- | include/configs/legoev3.h | 1 | ||||
| -rw-r--r-- | 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 ffb9a45..cf4ee16 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 41c8eb5..dab4ec2 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 1f3b003..18a8e26 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 13c9d56..991dad1 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 adb2446..f2f82ac 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 dae2c99..a08d90e 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 |