Convert CONFIG_SOC_DA8XX et al to Kconfig
Subsystems (3)
PATCH v2 1/1 Convert CONFIG_SOC_DA8XX et al to Kconfig
This converts the following to Kconfig:
CONFIG_SOC_DA8XX
CONFIG_SOC_DA850
CONFIG_MACH_DAVINCI_DA850_EVM
--- README | 2 -- arch/arm/mach-davinci/Kconfig | 24 +++++++++++++++++++++--- include/configs/calimain.h | 2 -- include/configs/da850evm.h | 3 --- include/configs/ea20.h | 3 --- include/configs/ipam390.h | 3 --- include/configs/legoev3.h | 3 --- include/configs/omapl138_lcdk.h | 1 - scripts/config_whitelist.txt | 3 --- 9 files changed, 21 insertions(+), 23 deletions(-)
README +0 -2
@@ -2351,8 +2351,6 @@ The following options need to be configured: CONFIG_AT91SAM9XE enable special bootcounter support on at91sam9xe based boards. - CONFIG_SOC_DA8XX - enable special bootcounter support on da850 based boards. CONFIG_BOOTCOUNT_RAM enable support for the bootcounter in RAM CONFIG_BOOTCOUNT_I2C
arch/arm/mach-davinci/Kconfig +21 -3
@@ -6,33 +6,41 @@ choice config TARGET_IPAM390 bool "IPAM390 board" + select MACH_DAVINCI_DA850_EVM + select SOC_DA850 select SUPPORT_SPL - select SYS_DA850_PLL_INIT - select SYS_DA850_DDR_INIT - + config TARGET_DA850EVM bool "DA850 EVM board" + select MACH_DAVINCI_DA850_EVM + select SOC_DA850 select SUPPORT_SPL select SYS_DA850_PLL_INIT select SYS_DA850_DDR_INIT config TARGET_EA20 bool "EA20 board" + select MACH_DAVINCI_DA850_EVM + select SOC_DA850 select BOARD_LATE_INIT config TARGET_OMAPL138_LCDK bool "OMAPL138 LCDK" + select SOC_DA850 select SUPPORT_SPL select SYS_DA850_PLL_INIT select SYS_DA850_DDR_INIT config TARGET_CALIMAIN bool "Calimain board" + select SOC_DA850 select SYS_DA850_PLL_INIT select SYS_DA850_DDR_INIT config TARGET_LEGOEV3 bool "LEGO MINDSTORMS EV3" + select MACH_DAVINCI_DA850_EVM + select SOC_DA850 select SYS_DA850_PLL_INIT select SYS_DA850_DDR_INIT
@@ -46,7 +54,17 @@ config SYS_DA850_PLL_INIT config SYS_DA850_DDR_INIT bool + +config SOC_DA850 + bool + select SOC_DA8XX + +config SOC_DA8XX + bool +config MACH_DAVINCI_DA850_EVM + bool + source "board/Barix/ipam390/Kconfig" source "board/davinci/da8xxevm/Kconfig" source "board/davinci/ea20/Kconfig"
include/configs/calimain.h +0 -2
@@ -22,8 +22,6 @@* SoC Configuration */ #define CONFIG_MACH_DAVINCI_CALIMAIN -#define CONFIG_SOC_DA8XX /* TI DA8xx SoC */ -#define CONFIG_SOC_DA850 /* TI DA850 SoC */ #define CONFIG_SYS_EXCEPTION_VECTORS_HIGH #define CONFIG_SYS_CLK_FREQ clk_get(DAVINCI_ARM_CLKID)#define CONFIG_SYS_OSCIN_FREQ calimain_get_osc_freq()
include/configs/da850evm.h +0 -3
@@ -33,9 +33,6 @@/* * 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_CLK_FREQ clk_get(DAVINCI_ARM_CLKID)#define CONFIG_SYS_OSCIN_FREQ 24000000
include/configs/ea20.h +0 -3
@@ -24,9 +24,6 @@/* * 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_OSCIN_FREQ 24000000#define CONFIG_SYS_TIMERBASE DAVINCI_TIMER0_BASE
include/configs/ipam390.h +0 -3
@@ -24,9 +24,6 @@/* * 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_CLK_FREQ clk_get(DAVINCI_ARM_CLKID)#define CONFIG_SYS_OSCIN_FREQ 24000000
include/configs/legoev3.h +0 -3
@@ -18,9 +18,6 @@/* * 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_CLK_FREQ clk_get(DAVINCI_ARM_CLKID)#define CONFIG_SYS_OSCIN_FREQ 24000000
include/configs/omapl138_lcdk.h +0 -1
@@ -24,7 +24,6 @@*/ #define CONFIG_MACH_OMAPL138_LCDK #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_OSCIN_FREQ 24000000#define CONFIG_SYS_TIMERBASE DAVINCI_TIMER0_BASE
scripts/config_whitelist.txt +0 -3
@@ -1295,7 +1295,6 @@ CONFIG_MACB3_PHY CONFIG_MACB_SEARCH_PHY CONFIG_MACH_ASPENITE CONFIG_MACH_DAVINCI_CALIMAIN -CONFIG_MACH_DAVINCI_DA850_EVM CONFIG_MACH_DOCKSTAR CONFIG_MACH_EDMINIV2 CONFIG_MACH_GOFLEXHOME
@@ -2021,8 +2020,6 @@ CONFIG_SOC_AU1100 CONFIG_SOC_AU1500 CONFIG_SOC_AU1550 CONFIG_SOC_AU1X00 -CONFIG_SOC_DA850 -CONFIG_SOC_DA8XX CONFIG_SOC_DM355 CONFIG_SOC_DM365 CONFIG_SOC_DM644X
Signature · 1 line
2.7.4
PATCH v2 1/1 Convert CONFIG_SOC_DA8XX et al to Kconfig
Missed the v2 (and wasn't subscribed to the U-Boot list), so the comments are mostly repeated.
Quoted 23 lines · Adam Ford
This converts the following to
Kconfig:CONFIG_SOC_DA8XX CONFIG_SOC_DA850 CONFIG_MACH_DAVINCI_DA850_EVMSigned-off-by Adam Ford <[email protected]>--- README | 2 -- arch/arm/mach-davinci/Kconfig | 24 +++++++++++++++++++++--- include/configs/calimain.h | 2 -- include/configs/da850evm.h | 3 --- include/configs/ea20.h | 3 --- include/configs/ipam390.h | 3 --- include/configs/legoev3.h | 3 --- include/configs/omapl138_lcdk.h | 1 - scripts/config_whitelist.txt | 3 --- 9 files changed, 21 insertions(+), 23 deletions(-)README +0
-0
README The following options need to be configured: · line 2355
Quoted 5 lines
README +0
-2@@ -2351,8 +2351,6 @@ The following options need to be configured: CONFIG_AT91SAM9XE enable special bootcounter support on at91sam9xe based boards. - CONFIG_SOC_DA8XX - enable special bootcounter support on da850 based boards.
Probably better to add a new config option CONFIG_BOOTCOUNT_DA8XX.
Quoted 8 lines
README +0
-0CONFIG_BOOTCOUNT_RAM enable support for the bootcounter in RAM CONFIG_BOOTCOUNT_I2Carch/arm/mach-davinci/Kconfig +0
-0
arch/arm/mach-davinci/Kconfig choice · line 11
Quoted 9 lines
arch/arm/mach-davinci/Kconfig +3
-3@@ -6,33 +6,41 @@ choice config TARGET_IPAM390 bool "IPAM390 board" + select MACH_DAVINCI_DA850_EVM + select SOC_DA850 > select SUPPORT_SPL - select SYS_DA850_PLL_INIT - select SYS_DA850_DDR_INIT - +
Trailing whitespace
Quoted 23 lines
arch/arm/mach-davinci/Kconfig +5
-0config TARGET_DA850EVM bool "DA850 EVM board" + select MACH_DAVINCI_DA850_EVM + select SOC_DA850 select SUPPORT_SPL select SYS_DA850_PLL_INIT select SYS_DA850_DDR_INIT config TARGET_EA20 bool "EA20 board" + select MACH_DAVINCI_DA850_EVM + select SOC_DA850 select BOARD_LATE_INIT config TARGET_OMAPL138_LCDK bool "OMAPL138 LCDK" + select SOC_DA850 select SUPPORT_SPL select SYS_DA850_PLL_INIT select SYS_DA850_DDR_INIT config TARGET_CALIMAIN bool "Calimain board"
arch/arm/mach-davinci/Kconfig choice · line 45
Quoted 10 lines
arch/arm/mach-davinci/Kconfig +3
-0+ select SOC_DA850 select SYS_DA850_PLL_INIT select SYS_DA850_DDR_INIT config TARGET_LEGOEV3 bool "LEGO MINDSTORMS EV3" + select MACH_DAVINCI_DA850_EVM + select SOC_DA850 select SYS_DA850_PLL_INIT select SYS_DA850_DDR_INIT
Since you cleaned this up in TARGET_IPAM390, you could clean up other boards too. CONFIG_SYS_DA850_PLL_INIT and CONFIG_SYS_DA850_DDR_INIT don't do anything if CONFIG_DA850_LOWLEVEL is not defined, so they can be removed from all boards except TARGET_CALIMAIN and TARGET_DA850EVM.
If CONFIG_DA850_LOWLEVEL was also made into a Kconfig option, then
select SYS_DA850_PLL_INIT if DA850_LOWLEVEL
select SYS_DA850_DDR_INIT if DA850_LOWLEVEL
would actually be more correct.