Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

davinci: kconfig: move board select menu and common settings

Browse Source 
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>
Reviewed-by: Tom Rini <trini@ti.com>
Cc: Heiko Schocher <hs@denx.de>
Cc: Sandeep Paulraj <s-paulraj@ti.com>
master
Masahiro Yamada 10 years ago committed by Tom Rini
parent 72df68cc6b
commit 3491ba6311
36 changed files with 105 additions and 189 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 67
      arch/arm/Kconfig
  2. 79
      arch/arm/cpu/arm926ejs/davinci/Kconfig
  3. 8
      board/Barix/ipam390/Kconfig
  4. 8
      board/ait/cam_enc_4xx/Kconfig
  5. 24
      board/davinci/da8xxevm/Kconfig
  6. 8
      board/davinci/dm355evm/Kconfig
  7. 8
      board/davinci/dm355leopard/Kconfig
  8. 8
      board/davinci/dm365evm/Kconfig
  9. 8
      board/davinci/dm6467evm/Kconfig
  10. 8
      board/davinci/dvevm/Kconfig
  11. 8
      board/davinci/ea20/Kconfig
  12. 8
      board/davinci/schmoogie/Kconfig
  13. 8
      board/davinci/sffsdr/Kconfig
  14. 8
      board/davinci/sonata/Kconfig
  15. 8
      board/enbw/enbw_cmc/Kconfig
  16. 8
      board/omicron/calimain/Kconfig
  17. 1
      configs/calimain_defconfig
  18. 1
      configs/cam_enc_4xx_defconfig
  19. 1
      configs/da830evm_defconfig
  20. 1
      configs/da850_am18xxevm_defconfig
  21. 1
      configs/da850evm_defconfig
  22. 1
      configs/da850evm_direct_nor_defconfig
  23. 1
      configs/davinci_dm355evm_defconfig
  24. 1
      configs/davinci_dm355leopard_defconfig
  25. 1
      configs/davinci_dm365evm_defconfig
  26. 1
      configs/davinci_dm6467Tevm_defconfig
  27. 1
      configs/davinci_dm6467evm_defconfig
  28. 1
      configs/davinci_dvevm_defconfig
  29. 1
      configs/davinci_schmoogie_defconfig
  30. 1
      configs/davinci_sffsdr_defconfig
  31. 1
      configs/davinci_sonata_defconfig
  32. 1
      configs/ea20_defconfig
  33. 1
      configs/enbw_cmc_defconfig
  34. 1
      configs/hawkboard_defconfig
  35. 1
      configs/hawkboard_uart_defconfig
  36. 1
      configs/ipam390_defconfig

67
arch/arm/Kconfig
Unescape View File

@ -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"
@ -632,6 +589,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"
@ -646,7 +605,6 @@ source "arch/arm/cpu/armv7/zynq/Kconfig"
source "board/8dtech/eco5pk/Kconfig"
source "board/aristainetos/Kconfig"
source "board/Barix/ipam390/Kconfig"
source "board/BuR/kwb/Kconfig"
source "board/BuR/tseries/Kconfig"
source "board/BuS/eb_cpux9k2/Kconfig"
@ -657,7 +615,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"
@ -695,22 +652,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"
@ -758,7 +704,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"

79
arch/arm/cpu/arm926ejs/davinci/Kconfig
Unescape View File

@ -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

8
board/Barix/ipam390/Kconfig
Unescape View File

@ -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"

8
board/ait/cam_enc_4xx/Kconfig
Unescape View File

@ -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"

24
board/davinci/da8xxevm/Kconfig
Unescape View File

@ -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"

8
board/davinci/dm355evm/Kconfig
Unescape View File

@ -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"

8
board/davinci/dm355leopard/Kconfig
Unescape View File

@ -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"

8
board/davinci/dm365evm/Kconfig
Unescape View File

@ -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"

8
board/davinci/dm6467evm/Kconfig
Unescape View File

@ -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"

8
board/davinci/dvevm/Kconfig
Unescape View File

@ -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"

8
board/davinci/ea20/Kconfig
Unescape View File

@ -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"

8
board/davinci/schmoogie/Kconfig
Unescape View File

@ -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"

8
board/davinci/sffsdr/Kconfig
Unescape View File

@ -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"

8
board/davinci/sonata/Kconfig
Unescape View File

@ -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"

8
board/enbw/enbw_cmc/Kconfig
Unescape View File

@ -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"

8
board/omicron/calimain/Kconfig
Unescape View File

@ -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
configs/calimain_defconfig
Unescape View File

@ -1,2 +1,3 @@
CONFIG_ARM=y
CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_CALIMAIN=y

1
configs/cam_enc_4xx_defconfig
Unescape View File

@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
+S:CONFIG_ARCH_DAVINCI=y
+S:CONFIG_TARGET_CAM_ENC_4XX=y

1
configs/da830evm_defconfig
Unescape View File

@ -1,2 +1,3 @@
CONFIG_ARM=y
CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_DA830EVM=y

1
configs/da850_am18xxevm_defconfig
Unescape View File

@ -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
configs/da850evm_defconfig
Unescape View File

@ -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
configs/da850evm_direct_nor_defconfig
Unescape View File

@ -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
configs/davinci_dm355evm_defconfig
Unescape View File

@ -1,2 +1,3 @@
CONFIG_ARM=y
CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_DAVINCI_DM355EVM=y

1
configs/davinci_dm355leopard_defconfig
Unescape View File

@ -1,2 +1,3 @@
CONFIG_ARM=y
CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_DAVINCI_DM355LEOPARD=y

1
configs/davinci_dm365evm_defconfig
Unescape View File

@ -1,2 +1,3 @@
CONFIG_ARM=y
CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_DAVINCI_DM365EVM=y

1
configs/davinci_dm6467Tevm_defconfig
Unescape View File

@ -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
configs/davinci_dm6467evm_defconfig
Unescape View File

@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="REFCLK_FREQ=27000000"
CONFIG_ARM=y
CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_DAVINCI_DM6467EVM=y

1
configs/davinci_dvevm_defconfig
Unescape View File

@ -1,2 +1,3 @@
CONFIG_ARM=y
CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_DAVINCI_DVEVM=y

1
configs/davinci_schmoogie_defconfig
Unescape View File

@ -1,2 +1,3 @@
CONFIG_ARM=y
CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_DAVINCI_SCHMOOGIE=y

1
configs/davinci_sffsdr_defconfig
Unescape View File

@ -1,2 +1,3 @@
CONFIG_ARM=y
CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_DAVINCI_SFFSDR=y

1
configs/davinci_sonata_defconfig
Unescape View File

@ -1,2 +1,3 @@
CONFIG_ARM=y
CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_DAVINCI_SONATA=y

1
configs/ea20_defconfig
Unescape View File

@ -1,2 +1,3 @@
CONFIG_ARM=y
CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_EA20=y

1
configs/enbw_cmc_defconfig
Unescape View File

@ -1,2 +1,3 @@
CONFIG_ARM=y
CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_ENBW_CMC=y

1
configs/hawkboard_defconfig
Unescape View File

@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
+S:CONFIG_ARCH_DAVINCI=y
+S:CONFIG_TARGET_HAWKBOARD=y

1
configs/hawkboard_uart_defconfig
Unescape View File

@ -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
configs/ipam390_defconfig
Unescape View File

@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
+S:CONFIG_ARCH_DAVINCI=y
+S:CONFIG_TARGET_IPAM390=y

Write Preview
Loading…
Cancel
Save