@@ -131,53 +131,10 @@ config TARGET_TAURUS
config TARGET_STAMP9G20
bool "Support stamp9g20"
-config TARGET_CAM_ENC_4XX
- bool "Support cam_enc_4xx"
-
-config TARGET_IPAM390
- bool "Support ipam390"
-
-config TARGET_DA830EVM
- bool "Support da830evm"
-
-config TARGET_DA850EVM
- bool "Support da850evm"
-
-config TARGET_HAWKBOARD
- bool "Support hawkboard"
-
-config TARGET_DAVINCI_DM355EVM
- bool "Support davinci_dm355evm"
-
-config TARGET_DAVINCI_DM355LEOPARD
- bool "Support davinci_dm355leopard"
-
-config TARGET_DAVINCI_DM365EVM
- bool "Support davinci_dm365evm"
-
-config TARGET_DAVINCI_DM6467EVM
- bool "Support davinci_dm6467evm"
-
-config TARGET_DAVINCI_DVEVM
- bool "Support davinci_dvevm"
-
-config TARGET_EA20
- bool "Support ea20"
-
-config TARGET_DAVINCI_SCHMOOGIE
- bool "Support davinci_schmoogie"
-
-config TARGET_DAVINCI_SFFSDR
- bool "Support davinci_sffsdr"
-
-config TARGET_DAVINCI_SONATA
- bool "Support davinci_sonata"
-
-config TARGET_ENBW_CMC
- bool "Support enbw_cmc"
-
-config TARGET_CALIMAIN
- bool "Support calimain"
+config ARCH_DAVINCI
+ bool "TI DaVinci"
+ help
+ Support for TI's DaVinci platform.
config KIRKWOOD
bool "Marvell Kirkwood"
@@ -620,6 +577,8 @@ config TARGET_JORNADA
endchoice
+source "arch/arm/cpu/arm926ejs/davinci/Kconfig"
+
source "arch/arm/cpu/armv7/exynos/Kconfig"
source "arch/arm/cpu/arm926ejs/kirkwood/Kconfig"
@@ -633,7 +592,6 @@ source "arch/arm/cpu/arm926ejs/versatile/Kconfig"
source "arch/arm/cpu/armv7/zynq/Kconfig"
source "board/8dtech/eco5pk/Kconfig"
-source "board/Barix/ipam390/Kconfig"
source "board/BuR/kwb/Kconfig"
source "board/BuR/tseries/Kconfig"
source "board/BuS/eb_cpux9k2/Kconfig"
@@ -644,7 +602,6 @@ source "board/Marvell/aspenite/Kconfig"
source "board/Marvell/dkb/Kconfig"
source "board/Marvell/gplugd/Kconfig"
source "board/afeb9260/Kconfig"
-source "board/ait/cam_enc_4xx/Kconfig"
source "board/altera/socfpga/Kconfig"
source "board/armadeus/apf27/Kconfig"
source "board/armltd/integrator/Kconfig"
@@ -680,22 +637,11 @@ source "board/congatec/cgtqmx6eval/Kconfig"
source "board/corscience/tricorder/Kconfig"
source "board/creative/xfi3/Kconfig"
source "board/davedenx/qong/Kconfig"
-source "board/davinci/da8xxevm/Kconfig"
-source "board/davinci/dm355evm/Kconfig"
-source "board/davinci/dm355leopard/Kconfig"
-source "board/davinci/dm365evm/Kconfig"
-source "board/davinci/dm6467evm/Kconfig"
-source "board/davinci/dvevm/Kconfig"
-source "board/davinci/ea20/Kconfig"
-source "board/davinci/schmoogie/Kconfig"
-source "board/davinci/sffsdr/Kconfig"
-source "board/davinci/sonata/Kconfig"
source "board/denx/m28evk/Kconfig"
source "board/denx/m53evk/Kconfig"
source "board/egnite/ethernut5/Kconfig"
source "board/embest/mx6boards/Kconfig"
source "board/emk/top9000/Kconfig"
-source "board/enbw/enbw_cmc/Kconfig"
source "board/esd/meesc/Kconfig"
source "board/esd/otc570/Kconfig"
source "board/esg/ima3-mx53/Kconfig"
@@ -742,7 +688,6 @@ source "board/matrix_vision/mvblx/Kconfig"
source "board/mpl/vcma9/Kconfig"
source "board/nokia/rx51/Kconfig"
source "board/olimex/mx23_olinuxino/Kconfig"
-source "board/omicron/calimain/Kconfig"
source "board/overo/Kconfig"
source "board/palmld/Kconfig"
source "board/palmtc/Kconfig"
new file mode 100644
@@ -0,0 +1,79 @@
+if ARCH_DAVINCI
+
+choice
+ prompt "DaVinci board select"
+
+config TARGET_ENBW_CMC
+ bool "EnBW CMC board"
+
+config TARGET_IPAM390
+ bool "IPAM390 board"
+
+config TARGET_DA830EVM
+ bool "DA830 EVM board"
+
+config TARGET_DA850EVM
+ bool "DA850 EVM board"
+
+config TARGET_CAM_ENC_4XX
+ bool "CAM ENC 4xx board"
+
+config TARGET_HAWKBOARD
+ bool "Hawkboard"
+
+config TARGET_DAVINCI_DM355EVM
+ bool "DM355 EVM board"
+
+config TARGET_DAVINCI_DM355LEOPARD
+ bool "DM355 Leopard board"
+
+config TARGET_DAVINCI_DM365EVM
+ bool "DM365 EVM board"
+
+config TARGET_DAVINCI_DM6467EVM
+ bool "DM6467 EVM board"
+
+config TARGET_DAVINCI_DVEVM
+ bool "DVEVM board"
+
+config TARGET_EA20
+ bool "EA20 board"
+
+config TARGET_DAVINCI_SCHMOOGIE
+ bool "Schmoogie board"
+
+config TARGET_DAVINCI_SFFSDR
+ bool "SFFSDR board"
+
+config TARGET_DAVINCI_SONATA
+ bool "Sonata board"
+
+config TARGET_CALIMAIN
+ bool "Calimain board"
+
+endchoice
+
+config SYS_CPU
+ string
+ default "arm926ejs"
+
+config SYS_SOC
+ string
+ default "davinci"
+
+source "board/enbw/enbw_cmc/Kconfig"
+source "board/ait/cam_enc_4xx/Kconfig"
+source "board/Barix/ipam390/Kconfig"
+source "board/davinci/da8xxevm/Kconfig"
+source "board/davinci/dm355evm/Kconfig"
+source "board/davinci/dm355leopard/Kconfig"
+source "board/davinci/dm365evm/Kconfig"
+source "board/davinci/dm6467evm/Kconfig"
+source "board/davinci/dvevm/Kconfig"
+source "board/davinci/ea20/Kconfig"
+source "board/davinci/schmoogie/Kconfig"
+source "board/davinci/sffsdr/Kconfig"
+source "board/davinci/sonata/Kconfig"
+source "board/omicron/calimain/Kconfig"
+
+endif
@@ -1,9 +1,5 @@
if TARGET_IPAM390
-config SYS_CPU
- string
- default "arm926ejs"
-
config SYS_BOARD
string
default "ipam390"
@@ -12,10 +8,6 @@ config SYS_VENDOR
string
default "Barix"
-config SYS_SOC
- string
- default "davinci"
-
config SYS_CONFIG_NAME
string
default "ipam390"
@@ -1,9 +1,5 @@
if TARGET_CAM_ENC_4XX
-config SYS_CPU
- string
- default "arm926ejs"
-
config SYS_BOARD
string
default "cam_enc_4xx"
@@ -12,10 +8,6 @@ config SYS_VENDOR
string
default "ait"
-config SYS_SOC
- string
- default "davinci"
-
config SYS_CONFIG_NAME
string
default "cam_enc_4xx"
@@ -1,9 +1,5 @@
if TARGET_DA830EVM
-config SYS_CPU
- string
- default "arm926ejs"
-
config SYS_BOARD
string
default "da8xxevm"
@@ -12,10 +8,6 @@ config SYS_VENDOR
string
default "davinci"
-config SYS_SOC
- string
- default "davinci"
-
config SYS_CONFIG_NAME
string
default "da830evm"
@@ -24,10 +16,6 @@ endif
if TARGET_DA850EVM
-config SYS_CPU
- string
- default "arm926ejs"
-
config SYS_BOARD
string
default "da8xxevm"
@@ -36,10 +24,6 @@ config SYS_VENDOR
string
default "davinci"
-config SYS_SOC
- string
- default "davinci"
-
config SYS_CONFIG_NAME
string
default "da850evm"
@@ -48,10 +32,6 @@ endif
if TARGET_HAWKBOARD
-config SYS_CPU
- string
- default "arm926ejs"
-
config SYS_BOARD
string
default "da8xxevm"
@@ -60,10 +40,6 @@ config SYS_VENDOR
string
default "davinci"
-config SYS_SOC
- string
- default "davinci"
-
config SYS_CONFIG_NAME
string
default "hawkboard"
@@ -1,9 +1,5 @@
if TARGET_DAVINCI_DM355EVM
-config SYS_CPU
- string
- default "arm926ejs"
-
config SYS_BOARD
string
default "dm355evm"
@@ -12,10 +8,6 @@ config SYS_VENDOR
string
default "davinci"
-config SYS_SOC
- string
- default "davinci"
-
config SYS_CONFIG_NAME
string
default "davinci_dm355evm"
@@ -1,9 +1,5 @@
if TARGET_DAVINCI_DM355LEOPARD
-config SYS_CPU
- string
- default "arm926ejs"
-
config SYS_BOARD
string
default "dm355leopard"
@@ -12,10 +8,6 @@ config SYS_VENDOR
string
default "davinci"
-config SYS_SOC
- string
- default "davinci"
-
config SYS_CONFIG_NAME
string
default "davinci_dm355leopard"
@@ -1,9 +1,5 @@
if TARGET_DAVINCI_DM365EVM
-config SYS_CPU
- string
- default "arm926ejs"
-
config SYS_BOARD
string
default "dm365evm"
@@ -12,10 +8,6 @@ config SYS_VENDOR
string
default "davinci"
-config SYS_SOC
- string
- default "davinci"
-
config SYS_CONFIG_NAME
string
default "davinci_dm365evm"
@@ -1,9 +1,5 @@
if TARGET_DAVINCI_DM6467EVM
-config SYS_CPU
- string
- default "arm926ejs"
-
config SYS_BOARD
string
default "dm6467evm"
@@ -12,10 +8,6 @@ config SYS_VENDOR
string
default "davinci"
-config SYS_SOC
- string
- default "davinci"
-
config SYS_CONFIG_NAME
string
default "davinci_dm6467evm"
@@ -1,9 +1,5 @@
if TARGET_DAVINCI_DVEVM
-config SYS_CPU
- string
- default "arm926ejs"
-
config SYS_BOARD
string
default "dvevm"
@@ -12,10 +8,6 @@ config SYS_VENDOR
string
default "davinci"
-config SYS_SOC
- string
- default "davinci"
-
config SYS_CONFIG_NAME
string
default "davinci_dvevm"
@@ -1,9 +1,5 @@
if TARGET_EA20
-config SYS_CPU
- string
- default "arm926ejs"
-
config SYS_BOARD
string
default "ea20"
@@ -12,10 +8,6 @@ config SYS_VENDOR
string
default "davinci"
-config SYS_SOC
- string
- default "davinci"
-
config SYS_CONFIG_NAME
string
default "ea20"
@@ -1,9 +1,5 @@
if TARGET_DAVINCI_SCHMOOGIE
-config SYS_CPU
- string
- default "arm926ejs"
-
config SYS_BOARD
string
default "schmoogie"
@@ -12,10 +8,6 @@ config SYS_VENDOR
string
default "davinci"
-config SYS_SOC
- string
- default "davinci"
-
config SYS_CONFIG_NAME
string
default "davinci_schmoogie"
@@ -1,9 +1,5 @@
if TARGET_DAVINCI_SFFSDR
-config SYS_CPU
- string
- default "arm926ejs"
-
config SYS_BOARD
string
default "sffsdr"
@@ -12,10 +8,6 @@ config SYS_VENDOR
string
default "davinci"
-config SYS_SOC
- string
- default "davinci"
-
config SYS_CONFIG_NAME
string
default "davinci_sffsdr"
@@ -1,9 +1,5 @@
if TARGET_DAVINCI_SONATA
-config SYS_CPU
- string
- default "arm926ejs"
-
config SYS_BOARD
string
default "sonata"
@@ -12,10 +8,6 @@ config SYS_VENDOR
string
default "davinci"
-config SYS_SOC
- string
- default "davinci"
-
config SYS_CONFIG_NAME
string
default "davinci_sonata"
@@ -1,9 +1,5 @@
if TARGET_ENBW_CMC
-config SYS_CPU
- string
- default "arm926ejs"
-
config SYS_BOARD
string
default "enbw_cmc"
@@ -12,10 +8,6 @@ config SYS_VENDOR
string
default "enbw"
-config SYS_SOC
- string
- default "davinci"
-
config SYS_CONFIG_NAME
string
default "enbw_cmc"
@@ -1,9 +1,5 @@
if TARGET_CALIMAIN
-config SYS_CPU
- string
- default "arm926ejs"
-
config SYS_BOARD
string
default "calimain"
@@ -12,10 +8,6 @@ config SYS_VENDOR
string
default "omicron"
-config SYS_SOC
- string
- default "davinci"
-
config SYS_CONFIG_NAME
string
default "calimain"
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_CALIMAIN=y
@@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_ARCH_DAVINCI=y
+S:CONFIG_TARGET_CAM_ENC_4XX=y
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_DA830EVM=y
@@ -1,4 +1,5 @@
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="DA850_AM18X_EVM,MAC_ADDR_IN_EEPROM,SYS_I2C_EEPROM_ADDR_LEN=2,SYS_I2C_EEPROM_ADDR=0x50"
+S:CONFIG_ARM=y
++S:CONFIG_ARCH_DAVINCI=y
+S:CONFIG_TARGET_DA850EVM=y
@@ -1,4 +1,5 @@
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="MAC_ADDR_IN_SPIFLASH"
+S:CONFIG_ARM=y
++S:CONFIG_ARCH_DAVINCI=y
+S:CONFIG_TARGET_DA850EVM=y
@@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="MAC_ADDR_IN_SPIFLASH,USE_NOR,DIRECT_NOR_BOOT"
CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_DA850EVM=y
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_DAVINCI_DM355EVM=y
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_DAVINCI_DM355LEOPARD=y
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_DAVINCI_DM365EVM=y
@@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="DAVINCI_DM6467TEVM,REFCLK_FREQ=33000000"
CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_DAVINCI_DM6467EVM=y
@@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="REFCLK_FREQ=27000000"
CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_DAVINCI_DM6467EVM=y
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_DAVINCI_DVEVM=y
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_DAVINCI_SCHMOOGIE=y
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_DAVINCI_SFFSDR=y
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_DAVINCI_SONATA=y
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_EA20=y
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_ENBW_CMC=y
@@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_ARCH_DAVINCI=y
+S:CONFIG_TARGET_HAWKBOARD=y
@@ -1,4 +1,5 @@
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="UART_U_BOOT"
+S:CONFIG_ARM=y
++S:CONFIG_ARCH_DAVINCI=y
+S:CONFIG_TARGET_HAWKBOARD=y
@@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_ARCH_DAVINCI=y
+S:CONFIG_TARGET_IPAM390=y
Becuase the board select menu in arch/arm/Kconfig is too big, move the Davinci board select menu to davinci/Kconfig. Move also common settings (CONFIG_SYS_CPU="arm926ejs" and CONFIG_SYS_SOC="davinci"). Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Heiko Schocher <hs@denx.de> Cc: Sandeep Paulraj <s-paulraj@ti.com> Cc: Tom Rini <trini@ti.com> --- arch/arm/Kconfig | 67 +++------------------------- arch/arm/cpu/arm926ejs/davinci/Kconfig | 79 ++++++++++++++++++++++++++++++++++ board/Barix/ipam390/Kconfig | 8 ---- board/ait/cam_enc_4xx/Kconfig | 8 ---- board/davinci/da8xxevm/Kconfig | 24 ----------- board/davinci/dm355evm/Kconfig | 8 ---- board/davinci/dm355leopard/Kconfig | 8 ---- board/davinci/dm365evm/Kconfig | 8 ---- board/davinci/dm6467evm/Kconfig | 8 ---- board/davinci/dvevm/Kconfig | 8 ---- board/davinci/ea20/Kconfig | 8 ---- board/davinci/schmoogie/Kconfig | 8 ---- board/davinci/sffsdr/Kconfig | 8 ---- board/davinci/sonata/Kconfig | 8 ---- board/enbw/enbw_cmc/Kconfig | 8 ---- board/omicron/calimain/Kconfig | 8 ---- configs/calimain_defconfig | 1 + configs/cam_enc_4xx_defconfig | 1 + configs/da830evm_defconfig | 1 + configs/da850_am18xxevm_defconfig | 1 + configs/da850evm_defconfig | 1 + configs/da850evm_direct_nor_defconfig | 1 + configs/davinci_dm355evm_defconfig | 1 + configs/davinci_dm355leopard_defconfig | 1 + configs/davinci_dm365evm_defconfig | 1 + configs/davinci_dm6467Tevm_defconfig | 1 + configs/davinci_dm6467evm_defconfig | 1 + configs/davinci_dvevm_defconfig | 1 + configs/davinci_schmoogie_defconfig | 1 + configs/davinci_sffsdr_defconfig | 1 + configs/davinci_sonata_defconfig | 1 + configs/ea20_defconfig | 1 + configs/enbw_cmc_defconfig | 1 + configs/hawkboard_defconfig | 1 + configs/hawkboard_uart_defconfig | 1 + configs/ipam390_defconfig | 1 + 36 files changed, 105 insertions(+), 189 deletions(-) create mode 100644 arch/arm/cpu/arm926ejs/davinci/Kconfig