LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert CONFIG_SOC_DA8XX et al to Kconfig 

This converts the following to Kconfig:
   CONFIG_SOC_DA8XX
   CONFIG_SOC_DA850
   CONFIG_DA850_LOWLEVEL
   CONFIG_MACH_DAVINCI_DA850_EVM
   CONFIG_SYS_DA850_PLL_INIT
   CONFIG_SYS_DA850_DDR_INIT

Signed-off-by: Adam Ford <aford173@gmail.com>
Reviewed-by: David Lechner <david@lechnology.com>
[trini: Rework CONFIG_SYS_DA850_PLL_INIT so it's selected on SOC_DA8XX]
Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Adam Ford 2018-01-11 08:20:27 -06:00 committed by Tom Rini
parent 8bad6cb176
commit 6aa4ad8e38
10 changed files with 28 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
arch/arm/mach-davinci/Kconfig
View File

@ -6,47 +6,63 @@ choice
config TARGET_IPAM390 config TARGET_IPAM390
bool "IPAM390 board" bool "IPAM390 board"
select MACH_DAVINCI_DA850_EVM
select SOC_DA850
select SUPPORT_SPL select SUPPORT_SPL
select SYS_DA850_PLL_INIT
select SYS_DA850_DDR_INIT
config TARGET_DA850EVM config TARGET_DA850EVM
bool "DA850 EVM board" bool "DA850 EVM board"
select MACH_DAVINCI_DA850_EVM
select SOC_DA850
select SUPPORT_SPL select SUPPORT_SPL
select SYS_DA850_PLL_INIT
select SYS_DA850_DDR_INIT
config TARGET_EA20 config TARGET_EA20
bool "EA20 board" bool "EA20 board"
select MACH_DAVINCI_DA850_EVM
select SOC_DA850
select BOARD_LATE_INIT select BOARD_LATE_INIT
config TARGET_OMAPL138_LCDK config TARGET_OMAPL138_LCDK
bool "OMAPL138 LCDK" bool "OMAPL138 LCDK"
select SOC_DA8XX
select SUPPORT_SPL select SUPPORT_SPL
select SYS_DA850_PLL_INIT
select SYS_DA850_DDR_INIT
config TARGET_CALIMAIN config TARGET_CALIMAIN
bool "Calimain board" bool "Calimain board"
select SYS_DA850_PLL_INIT select SOC_DA850
select SYS_DA850_DDR_INIT
config TARGET_LEGOEV3 config TARGET_LEGOEV3
bool "LEGO MINDSTORMS EV3" bool "LEGO MINDSTORMS EV3"
select SYS_DA850_PLL_INIT select MACH_DAVINCI_DA850_EVM
select SYS_DA850_DDR_INIT select SOC_DA850
endchoice endchoice
config SYS_SOC config SYS_SOC
default "davinci" default "davinci"
config DA850_LOWLEVEL
bool "Enable Lowlevel DA850 initialization"
depends on SOC_DA850
config SYS_DA850_PLL_INIT config SYS_DA850_PLL_INIT
bool bool
config SYS_DA850_DDR_INIT config SYS_DA850_DDR_INIT
bool bool
config SOC_DA850
bool
select SOC_DA8XX
select SYS_DA850_DDR_INIT if SUPPORT_SPL || DA850_LOWLEVEL
config SOC_DA8XX
bool
select SYS_DA850_PLL_INIT if SUPPORT_SPL || DA850_LOWLEVEL
config MACH_DAVINCI_DA850_EVM
bool
source "board/Barix/ipam390/Kconfig" source "board/Barix/ipam390/Kconfig"
source "board/davinci/da8xxevm/Kconfig" source "board/davinci/da8xxevm/Kconfig"
source "board/davinci/ea20/Kconfig" source "board/davinci/ea20/Kconfig"

1
configs/calimain_defconfig
View File

@ -1,6 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_DAVINCI=y CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_CALIMAIN=y CONFIG_TARGET_CALIMAIN=y
CONFIG_DA850_LOWLEVEL=y
CONFIG_BOOTDELAY=0 CONFIG_BOOTDELAY=0
CONFIG_VERSION_VARIABLE=y CONFIG_VERSION_VARIABLE=y
# CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_CPUINFO is not set

1
configs/da850evm_direct_nor_defconfig
View File

@ -1,6 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_DAVINCI=y CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_DA850EVM=y CONFIG_TARGET_DA850EVM=y
CONFIG_DA850_LOWLEVEL=y
CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_TI_COMMON_CMD_OPTIONS=y
CONFIG_DEFAULT_DEVICE_TREE="da850-evm" CONFIG_DEFAULT_DEVICE_TREE="da850-evm"
# CONFIG_SYS_MALLOC_F is not set # CONFIG_SYS_MALLOC_F is not set

3
include/configs/calimain.h
View File

@ -21,15 +21,12 @@
/* /*
* SoC Configuration * SoC Configuration
*/ */
#define CONFIG_SOC_DA8XX /* TI DA8xx SoC */
#define CONFIG_SOC_DA850 /* TI DA850 SoC */
#define CONFIG_SYS_EXCEPTION_VECTORS_HIGH #define CONFIG_SYS_EXCEPTION_VECTORS_HIGH
#define CONFIG_SYS_CLK_FREQ clk_get(DAVINCI_ARM_CLKID) #define CONFIG_SYS_CLK_FREQ clk_get(DAVINCI_ARM_CLKID)
#define CONFIG_SYS_OSCIN_FREQ calimain_get_osc_freq() #define CONFIG_SYS_OSCIN_FREQ calimain_get_osc_freq()
#define CONFIG_SYS_TIMERBASE DAVINCI_TIMER0_BASE #define CONFIG_SYS_TIMERBASE DAVINCI_TIMER0_BASE
#define CONFIG_SYS_HZ_CLOCK clk_get(DAVINCI_AUXCLK_CLKID) #define CONFIG_SYS_HZ_CLOCK clk_get(DAVINCI_AUXCLK_CLKID)
#define CONFIG_SYS_TEXT_BASE 0x60000000 #define CONFIG_SYS_TEXT_BASE 0x60000000
#define CONFIG_DA850_LOWLEVEL
#define CONFIG_ARCH_CPU_INIT #define CONFIG_ARCH_CPU_INIT
#define CONFIG_DA8XX_GPIO #define CONFIG_DA8XX_GPIO
#define CONFIG_HW_WATCHDOG #define CONFIG_HW_WATCHDOG

4
include/configs/da850evm.h
View File

@ -33,9 +33,6 @@
/* /*
* SoC Configuration * SoC Configuration
*/ */
#define CONFIG_MACH_DAVINCI_DA850_EVM
#define CONFIG_SOC_DA8XX /* TI DA8xx SoC */
#define CONFIG_SOC_DA850 /* TI DA850 SoC */
#define CONFIG_SYS_EXCEPTION_VECTORS_HIGH #define CONFIG_SYS_EXCEPTION_VECTORS_HIGH
#define CONFIG_SYS_CLK_FREQ clk_get(DAVINCI_ARM_CLKID) #define CONFIG_SYS_CLK_FREQ clk_get(DAVINCI_ARM_CLKID)
#define CONFIG_SYS_OSCIN_FREQ 24000000 #define CONFIG_SYS_OSCIN_FREQ 24000000
@ -47,7 +44,6 @@
#define CONFIG_DA8XX_GPIO #define CONFIG_DA8XX_GPIO
#define CONFIG_SYS_TEXT_BASE 0x60000000 #define CONFIG_SYS_TEXT_BASE 0x60000000
#define CONFIG_SYS_DV_NOR_BOOT_CFG (0x11) #define CONFIG_SYS_DV_NOR_BOOT_CFG (0x11)
#define CONFIG_DA850_LOWLEVEL
#else #else
#define CONFIG_SYS_TEXT_BASE 0xc1080000 #define CONFIG_SYS_TEXT_BASE 0xc1080000
#endif #endif

3
include/configs/ea20.h
View File

@ -24,9 +24,6 @@
/* /*
* SoC Configuration * SoC Configuration
*/ */
#define CONFIG_MACH_DAVINCI_DA850_EVM
#define CONFIG_SOC_DA8XX /* TI DA8xx SoC */
#define CONFIG_SOC_DA850 /* TI DA850 SoC */
#define CONFIG_SYS_CLK_FREQ clk_get(DAVINCI_ARM_CLKID) #define CONFIG_SYS_CLK_FREQ clk_get(DAVINCI_ARM_CLKID)
#define CONFIG_SYS_OSCIN_FREQ 24000000 #define CONFIG_SYS_OSCIN_FREQ 24000000
#define CONFIG_SYS_TIMERBASE DAVINCI_TIMER0_BASE #define CONFIG_SYS_TIMERBASE DAVINCI_TIMER0_BASE

3
include/configs/ipam390.h
View File

@ -24,9 +24,6 @@
/* /*
* SoC Configuration * SoC Configuration
*/ */
#define CONFIG_MACH_DAVINCI_DA850_EVM
#define CONFIG_SOC_DA8XX /* TI DA8xx SoC */
#define CONFIG_SOC_DA850 /* TI DA850 SoC */
#define CONFIG_SYS_EXCEPTION_VECTORS_HIGH #define CONFIG_SYS_EXCEPTION_VECTORS_HIGH
#define CONFIG_SYS_CLK_FREQ clk_get(DAVINCI_ARM_CLKID) #define CONFIG_SYS_CLK_FREQ clk_get(DAVINCI_ARM_CLKID)
#define CONFIG_SYS_OSCIN_FREQ 24000000 #define CONFIG_SYS_OSCIN_FREQ 24000000

3
include/configs/legoev3.h
View File

@ -18,9 +18,6 @@
/* /*
* SoC Configuration * SoC Configuration
*/ */
#define CONFIG_MACH_DAVINCI_DA850_EVM
#define CONFIG_SOC_DA8XX /* TI DA8xx SoC */
#define CONFIG_SOC_DA850 /* TI DA850 SoC */
#define CONFIG_SYS_EXCEPTION_VECTORS_HIGH #define CONFIG_SYS_EXCEPTION_VECTORS_HIGH
#define CONFIG_SYS_CLK_FREQ clk_get(DAVINCI_ARM_CLKID) #define CONFIG_SYS_CLK_FREQ clk_get(DAVINCI_ARM_CLKID)
#define CONFIG_SYS_OSCIN_FREQ 24000000 #define CONFIG_SYS_OSCIN_FREQ 24000000

1
include/configs/omapl138_lcdk.h
View File

@ -24,7 +24,6 @@
*/ */
#define CONFIG_MACH_OMAPL138_LCDK #define CONFIG_MACH_OMAPL138_LCDK
#define CONFIG_ARM926EJS /* arm926ejs CPU core */ #define CONFIG_ARM926EJS /* arm926ejs CPU core */
#define CONFIG_SOC_DA8XX /* TI DA8xx SoC */
#define CONFIG_SYS_CLK_FREQ clk_get(DAVINCI_ARM_CLKID) #define CONFIG_SYS_CLK_FREQ clk_get(DAVINCI_ARM_CLKID)
#define CONFIG_SYS_OSCIN_FREQ 24000000 #define CONFIG_SYS_OSCIN_FREQ 24000000
#define CONFIG_SYS_TIMERBASE DAVINCI_TIMER0_BASE #define CONFIG_SYS_TIMERBASE DAVINCI_TIMER0_BASE

4
scripts/config_whitelist.txt
View File

@ -344,7 +344,6 @@ CONFIG_CUSTOMER_BOARD_SUPPORT
CONFIG_D2NET_V2 CONFIG_D2NET_V2
CONFIG_DA850_AM18X_EVM CONFIG_DA850_AM18X_EVM
CONFIG_DA850_EVM_MAX_CPU_CLK CONFIG_DA850_EVM_MAX_CPU_CLK
CONFIG_DA850_LOWLEVEL
CONFIG_DA8XX_GPIO CONFIG_DA8XX_GPIO
CONFIG_DBAU1000 CONFIG_DBAU1000
CONFIG_DBAU1X00 CONFIG_DBAU1X00
@ -1276,7 +1275,6 @@ CONFIG_MACB1_PHY
CONFIG_MACB2_PHY CONFIG_MACB2_PHY
CONFIG_MACB3_PHY CONFIG_MACB3_PHY
CONFIG_MACB_SEARCH_PHY CONFIG_MACB_SEARCH_PHY
CONFIG_MACH_DAVINCI_DA850_EVM
CONFIG_MACH_OMAPL138_LCDK CONFIG_MACH_OMAPL138_LCDK
CONFIG_MACH_SPECIFIC CONFIG_MACH_SPECIFIC
CONFIG_MACH_TYPE CONFIG_MACH_TYPE
@ -1969,8 +1967,6 @@ CONFIG_SOC_AU1100
CONFIG_SOC_AU1500 CONFIG_SOC_AU1500
CONFIG_SOC_AU1550 CONFIG_SOC_AU1550
CONFIG_SOC_AU1X00 CONFIG_SOC_AU1X00
CONFIG_SOC_DA850
CONFIG_SOC_DA8XX
CONFIG_SOC_DM355 CONFIG_SOC_DM355
CONFIG_SOC_DM365 CONFIG_SOC_DM365
CONFIG_SOC_DM644X CONFIG_SOC_DM644X