From 3cfbcb58d38a0fa996a2566868af149e0515311e Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Sun, 31 Aug 2014 07:11:02 +0900 Subject: [PATCH] omap3: kconfig: move board select menu and common settings Becuase the board select menu in arch/arm/Kconfig is too big, move the OMAP3 board select menu to omap3/Kconfig. Move also common settings (CONFIG_SYS_CPU="armv7" and CONFIG_SYS_SOC="omap3 Signed-off-by: Masahiro Yamada Reviewed-by: Tom Rini --- arch/arm/Kconfig | 93 +-------------------- arch/arm/cpu/armv7/omap3/Kconfig | 107 +++++++++++++++++++++++++ board/8dtech/eco5pk/Kconfig | 8 -- board/comelit/dig297/Kconfig | 8 -- board/compulab/cm_t35/Kconfig | 8 -- board/corscience/tricorder/Kconfig | 8 -- board/htkw/mcx/Kconfig | 8 -- board/isee/igep00x0/Kconfig | 8 -- board/logicpd/am3517evm/Kconfig | 8 -- board/logicpd/omap3som/Kconfig | 8 -- board/logicpd/zoom1/Kconfig | 8 -- board/matrix_vision/mvblx/Kconfig | 8 -- board/nokia/rx51/Kconfig | 8 -- board/overo/Kconfig | 8 -- board/pandora/Kconfig | 8 -- board/technexion/tao3530/Kconfig | 8 -- board/technexion/twister/Kconfig | 8 -- board/teejet/mt_ventoux/Kconfig | 8 -- board/ti/am3517crane/Kconfig | 8 -- board/ti/beagle/Kconfig | 8 -- board/ti/evm/Kconfig | 24 ------ board/ti/sdp3430/Kconfig | 8 -- board/timll/devkit8000/Kconfig | 8 -- configs/am3517_crane_defconfig | 1 + configs/am3517_evm_defconfig | 1 + configs/cm_t35_defconfig | 1 + configs/devkit8000_defconfig | 1 + configs/dig297_defconfig | 1 + configs/eco5pk_defconfig | 1 + configs/igep0020_defconfig | 1 + configs/igep0020_nand_defconfig | 1 + configs/igep0030_defconfig | 1 + configs/igep0030_nand_defconfig | 1 + configs/igep0032_defconfig | 1 + configs/mcx_defconfig | 1 + configs/mt_ventoux_defconfig | 1 + configs/nokia_rx51_defconfig | 1 + configs/omap3_beagle_defconfig | 1 + configs/omap3_evm_defconfig | 1 + configs/omap3_evm_quick_mmc_defconfig | 1 + configs/omap3_evm_quick_nand_defconfig | 1 + configs/omap3_ha_defconfig | 1 + configs/omap3_logic_defconfig | 1 + configs/omap3_mvblx_defconfig | 1 + configs/omap3_overo_defconfig | 1 + configs/omap3_pandora_defconfig | 1 + configs/omap3_sdp3430_defconfig | 1 + configs/omap3_zoom1_defconfig | 1 + configs/tao3530_defconfig | 1 + configs/tricorder_defconfig | 1 + configs/tricorder_flash_defconfig | 1 + configs/twister_defconfig | 1 + include/configs/am3517_crane.h | 1 - include/configs/am3517_evm.h | 1 - include/configs/cm_t35.h | 1 - include/configs/devkit8000.h | 1 - include/configs/dig297.h | 1 - include/configs/mcx.h | 1 - include/configs/nokia_rx51.h | 1 - include/configs/omap3_evm_common.h | 1 - include/configs/omap3_logic.h | 1 - include/configs/omap3_mvblx.h | 1 - include/configs/omap3_pandora.h | 1 - include/configs/omap3_sdp3430.h | 1 - include/configs/tam3517-common.h | 1 - include/configs/tao3530.h | 1 - include/configs/ti_omap3_common.h | 1 - include/configs/tricorder.h | 1 - 68 files changed, 140 insertions(+), 289 deletions(-) create mode 100644 arch/arm/cpu/armv7/omap3/Kconfig diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 24614e3ead..3f38b04226 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -412,74 +412,8 @@ config TARGET_GW_VENTANA config TARGET_HUMMINGBOARD bool "Support hummingboard" -config TARGET_OMAP3_OVERO - bool "Support omap3_overo" - -config TARGET_OMAP3_PANDORA - bool "Support omap3_pandora" - -config TARGET_ECO5PK - bool "Support eco5pk" - -config TARGET_DIG297 - bool "Support dig297" - -config TARGET_CM_T35 - bool "Support cm_t35" - -config TARGET_TRICORDER - bool "Support tricorder" - -config TARGET_MCX - bool "Support mcx" - -config TARGET_OMAP3_IGEP00X0 - bool "Support omap3_igep00x0" - -config TARGET_AM3517_EVM - bool "Support am3517_evm" - -config TARGET_OMAP3_LOGIC - bool "Support omap3_logic" - -config TARGET_OMAP3_ZOOM1 - bool "Support omap3_zoom1" - -config TARGET_OMAP3_MVBLX - bool "Support omap3_mvblx" - -config TARGET_NOKIA_RX51 - bool "Support nokia_rx51" - -config TARGET_TAO3530 - bool "Support tao3530" - -config TARGET_TWISTER - bool "Support twister" - -config TARGET_MT_VENTOUX - bool "Support mt_ventoux" - -config TARGET_AM3517_CRANE - bool "Support am3517_crane" - -config TARGET_OMAP3_BEAGLE - bool "Support omap3_beagle" - -config TARGET_OMAP3_EVM - bool "Support omap3_evm" - -config TARGET_OMAP3_EVM_QUICK_MMC - bool "Support omap3_evm_quick_mmc" - -config TARGET_OMAP3_EVM_QUICK_NAND - bool "Support omap3_evm_quick_nand" - -config TARGET_OMAP3_SDP3430 - bool "Support omap3_sdp3430" - -config TARGET_DEVKIT8000 - bool "Support devkit8000" +config OMAP34XX + bool "OMAP34XX SoC" config TARGET_DUOVERO bool "Support duovero" @@ -595,6 +529,8 @@ source "arch/arm/cpu/armv7/exynos/Kconfig" source "arch/arm/cpu/arm926ejs/kirkwood/Kconfig" +source "arch/arm/cpu/armv7/omap3/Kconfig" + source "arch/arm/cpu/armv7/rmobile/Kconfig" source "arch/arm/cpu/armv7/tegra-common/Kconfig" @@ -603,7 +539,6 @@ source "arch/arm/cpu/arm926ejs/versatile/Kconfig" source "arch/arm/cpu/armv7/zynq/Kconfig" -source "board/8dtech/eco5pk/Kconfig" source "board/aristainetos/Kconfig" source "board/BuR/kwb/Kconfig" source "board/BuR/tseries/Kconfig" @@ -644,12 +579,9 @@ source "board/calao/usb_a9263/Kconfig" source "board/cirrus/edb93xx/Kconfig" source "board/cm4008/Kconfig" source "board/cm41xx/Kconfig" -source "board/comelit/dig297/Kconfig" source "board/compulab/cm_t335/Kconfig" -source "board/compulab/cm_t35/Kconfig" source "board/compulab/cm_t54/Kconfig" source "board/congatec/cgtqmx6eval/Kconfig" -source "board/corscience/tricorder/Kconfig" source "board/creative/xfi3/Kconfig" source "board/davedenx/qong/Kconfig" source "board/denx/m28evk/Kconfig" @@ -688,27 +620,18 @@ source "board/gumstix/pepper/Kconfig" source "board/h2200/Kconfig" source "board/hale/tt01/Kconfig" source "board/highbank/Kconfig" -source "board/htkw/mcx/Kconfig" source "board/icpdas/lp8x4x/Kconfig" source "board/imx31_phycore/Kconfig" source "board/isee/igep0033/Kconfig" -source "board/isee/igep00x0/Kconfig" source "board/jornada/Kconfig" source "board/karo/tx25/Kconfig" -source "board/logicpd/am3517evm/Kconfig" source "board/logicpd/imx27lite/Kconfig" source "board/logicpd/imx31_litekit/Kconfig" -source "board/logicpd/omap3som/Kconfig" -source "board/logicpd/zoom1/Kconfig" -source "board/matrix_vision/mvblx/Kconfig" source "board/mpl/vcma9/Kconfig" -source "board/nokia/rx51/Kconfig" source "board/olimex/mx23_olinuxino/Kconfig" -source "board/overo/Kconfig" source "board/palmld/Kconfig" source "board/palmtc/Kconfig" source "board/palmtreo680/Kconfig" -source "board/pandora/Kconfig" source "board/phytec/pcm051/Kconfig" source "board/ppcag/bg0900/Kconfig" source "board/pxa255_idp/Kconfig" @@ -741,25 +664,17 @@ source "board/sunxi/Kconfig" source "board/syteco/jadecpu/Kconfig" source "board/syteco/zmx25/Kconfig" source "board/taskit/stamp9g20/Kconfig" -source "board/technexion/tao3530/Kconfig" -source "board/technexion/twister/Kconfig" -source "board/teejet/mt_ventoux/Kconfig" source "board/ti/am335x/Kconfig" -source "board/ti/am3517crane/Kconfig" source "board/ti/am43xx/Kconfig" -source "board/ti/beagle/Kconfig" source "board/ti/dra7xx/Kconfig" -source "board/ti/evm/Kconfig" source "board/ti/ks2_evm/Kconfig" source "board/ti/omap5_uevm/Kconfig" source "board/ti/panda/Kconfig" -source "board/ti/sdp3430/Kconfig" source "board/ti/sdp4430/Kconfig" source "board/ti/ti814x/Kconfig" source "board/ti/ti816x/Kconfig" source "board/ti/tnetv107xevm/Kconfig" source "board/timll/devkit3250/Kconfig" -source "board/timll/devkit8000/Kconfig" source "board/toradex/colibri_pxa270/Kconfig" source "board/trizepsiv/Kconfig" source "board/ttcontrol/vision2/Kconfig" diff --git a/arch/arm/cpu/armv7/omap3/Kconfig b/arch/arm/cpu/armv7/omap3/Kconfig new file mode 100644 index 0000000000..6578f0cf5a --- /dev/null +++ b/arch/arm/cpu/armv7/omap3/Kconfig @@ -0,0 +1,107 @@ +if OMAP34XX + +choice + prompt "OMAP3 board select" + +config TARGET_AM3517_EVM + bool "AM3517 EVM" + +config TARGET_MT_VENTOUX + bool "TeeJet Mt.Ventoux" + +config TARGET_OMAP3_SDP3430 + bool "TI OMAP3430 SDP" + +config TARGET_OMAP3_BEAGLE + bool "TI OMAP3 BeagleBoard" + +config TARGET_CM_T35 + bool "CompuLab CM-T35" + +config TARGET_DEVKIT8000 + bool "TimLL OMAP3 Devkit8000" + +config TARGET_OMAP3_EVM + bool "TI OMAP3 EVM" + +config TARGET_OMAP3_EVM_QUICK_MMC + bool "TI OMAP3 EVM Quick MMC" + +config TARGET_OMAP3_EVM_QUICK_NAND + bool "TI OMAP3 EVM Quick NAND" + +config TARGET_OMAP3_IGEP00X0 + bool "IGEP" + +config TARGET_OMAP3_OVERO + bool "OMAP35xx Gumstix Overo" + +config TARGET_OMAP3_ZOOM1 + bool "TI Zoom1" + +config TARGET_AM3517_CRANE + bool "am3517_crane" + +config TARGET_OMAP3_PANDORA + bool "OMAP3 Pandora" + +config TARGET_ECO5PK + bool "ECO5PK" + +config TARGET_DIG297 + bool "DIG297" + +config TARGET_TRICORDER + bool "Tricorder" + +config TARGET_MCX + bool "MCX" + +config TARGET_OMAP3_LOGIC + bool "OMAP3 Logic" + +config TARGET_OMAP3_MVBLX + bool "OMAP3 MVBLX" + +config TARGET_NOKIA_RX51 + bool "Nokia RX51" + +config TARGET_TAO3530 + bool "TAO3530" + +config TARGET_TWISTER + bool "Twister" + +endchoice + +config SYS_CPU + string + default "armv7" + +config SYS_SOC + string + default "omap3" + +source "board/logicpd/am3517evm/Kconfig" +source "board/teejet/mt_ventoux/Kconfig" +source "board/ti/sdp3430/Kconfig" +source "board/ti/beagle/Kconfig" +source "board/compulab/cm_t35/Kconfig" +source "board/timll/devkit8000/Kconfig" +source "board/ti/evm/Kconfig" +source "board/isee/igep00x0/Kconfig" +source "board/overo/Kconfig" +source "board/logicpd/zoom1/Kconfig" +source "board/ti/am3517crane/Kconfig" +source "board/pandora/Kconfig" +source "board/8dtech/eco5pk/Kconfig" +source "board/comelit/dig297/Kconfig" +source "board/corscience/tricorder/Kconfig" +source "board/htkw/mcx/Kconfig" +source "board/logicpd/omap3som/Kconfig" +source "board/matrix_vision/mvblx/Kconfig" +source "board/nokia/rx51/Kconfig" +source "board/technexion/tao3530/Kconfig" +source "board/technexion/twister/Kconfig" + +endif diff --git a/board/8dtech/eco5pk/Kconfig b/board/8dtech/eco5pk/Kconfig index fb1b30876e..0af1b30318 100644 --- a/board/8dtech/eco5pk/Kconfig +++ b/board/8dtech/eco5pk/Kconfig @@ -1,9 +1,5 @@ if TARGET_ECO5PK -config SYS_CPU - string - default "armv7" - config SYS_BOARD string default "eco5pk" @@ -12,10 +8,6 @@ config SYS_VENDOR string default "8dtech" -config SYS_SOC - string - default "omap3" - config SYS_CONFIG_NAME string default "eco5pk" diff --git a/board/comelit/dig297/Kconfig b/board/comelit/dig297/Kconfig index d7a2bf24ab..4c5ea09b96 100644 --- a/board/comelit/dig297/Kconfig +++ b/board/comelit/dig297/Kconfig @@ -1,9 +1,5 @@ if TARGET_DIG297 -config SYS_CPU - string - default "armv7" - config SYS_BOARD string default "dig297" @@ -12,10 +8,6 @@ config SYS_VENDOR string default "comelit" -config SYS_SOC - string - default "omap3" - config SYS_CONFIG_NAME string default "dig297" diff --git a/board/compulab/cm_t35/Kconfig b/board/compulab/cm_t35/Kconfig index fd960bc946..06de69261d 100644 --- a/board/compulab/cm_t35/Kconfig +++ b/board/compulab/cm_t35/Kconfig @@ -1,9 +1,5 @@ if TARGET_CM_T35 -config SYS_CPU - string - default "armv7" - config SYS_BOARD string default "cm_t35" @@ -12,10 +8,6 @@ config SYS_VENDOR string default "compulab" -config SYS_SOC - string - default "omap3" - config SYS_CONFIG_NAME string default "cm_t35" diff --git a/board/corscience/tricorder/Kconfig b/board/corscience/tricorder/Kconfig index a1e06e7f2f..5147fd76b8 100644 --- a/board/corscience/tricorder/Kconfig +++ b/board/corscience/tricorder/Kconfig @@ -1,9 +1,5 @@ if TARGET_TRICORDER -config SYS_CPU - string - default "armv7" - config SYS_BOARD string default "tricorder" @@ -12,10 +8,6 @@ config SYS_VENDOR string default "corscience" -config SYS_SOC - string - default "omap3" - config SYS_CONFIG_NAME string default "tricorder" diff --git a/board/htkw/mcx/Kconfig b/board/htkw/mcx/Kconfig index 1e2c679649..343ff4d0f0 100644 --- a/board/htkw/mcx/Kconfig +++ b/board/htkw/mcx/Kconfig @@ -1,9 +1,5 @@ if TARGET_MCX -config SYS_CPU - string - default "armv7" - config SYS_BOARD string default "mcx" @@ -12,10 +8,6 @@ config SYS_VENDOR string default "htkw" -config SYS_SOC - string - default "omap3" - config SYS_CONFIG_NAME string default "mcx" diff --git a/board/isee/igep00x0/Kconfig b/board/isee/igep00x0/Kconfig index c9f2969cb8..c9352fdc88 100644 --- a/board/isee/igep00x0/Kconfig +++ b/board/isee/igep00x0/Kconfig @@ -1,9 +1,5 @@ if TARGET_OMAP3_IGEP00X0 -config SYS_CPU - string - default "armv7" - config SYS_BOARD string default "igep00x0" @@ -12,10 +8,6 @@ config SYS_VENDOR string default "isee" -config SYS_SOC - string - default "omap3" - config SYS_CONFIG_NAME string default "omap3_igep00x0" diff --git a/board/logicpd/am3517evm/Kconfig b/board/logicpd/am3517evm/Kconfig index 9bc5ae58f2..1012d3ddc5 100644 --- a/board/logicpd/am3517evm/Kconfig +++ b/board/logicpd/am3517evm/Kconfig @@ -1,9 +1,5 @@ if TARGET_AM3517_EVM -config SYS_CPU - string - default "armv7" - config SYS_BOARD string default "am3517evm" @@ -12,10 +8,6 @@ config SYS_VENDOR string default "logicpd" -config SYS_SOC - string - default "omap3" - config SYS_CONFIG_NAME string default "am3517_evm" diff --git a/board/logicpd/omap3som/Kconfig b/board/logicpd/omap3som/Kconfig index daaefa6d86..adeaf4d033 100644 --- a/board/logicpd/omap3som/Kconfig +++ b/board/logicpd/omap3som/Kconfig @@ -1,9 +1,5 @@ if TARGET_OMAP3_LOGIC -config SYS_CPU - string - default "armv7" - config SYS_BOARD string default "omap3som" @@ -12,10 +8,6 @@ config SYS_VENDOR string default "logicpd" -config SYS_SOC - string - default "omap3" - config SYS_CONFIG_NAME string default "omap3_logic" diff --git a/board/logicpd/zoom1/Kconfig b/board/logicpd/zoom1/Kconfig index 3199130604..e9a56230ce 100644 --- a/board/logicpd/zoom1/Kconfig +++ b/board/logicpd/zoom1/Kconfig @@ -1,9 +1,5 @@ if TARGET_OMAP3_ZOOM1 -config SYS_CPU - string - default "armv7" - config SYS_BOARD string default "zoom1" @@ -12,10 +8,6 @@ config SYS_VENDOR string default "logicpd" -config SYS_SOC - string - default "omap3" - config SYS_CONFIG_NAME string default "omap3_zoom1" diff --git a/board/matrix_vision/mvblx/Kconfig b/board/matrix_vision/mvblx/Kconfig index d89c1e3b9d..69f05661cb 100644 --- a/board/matrix_vision/mvblx/Kconfig +++ b/board/matrix_vision/mvblx/Kconfig @@ -1,9 +1,5 @@ if TARGET_OMAP3_MVBLX -config SYS_CPU - string - default "armv7" - config SYS_BOARD string default "mvblx" @@ -12,10 +8,6 @@ config SYS_VENDOR string default "matrix_vision" -config SYS_SOC - string - default "omap3" - config SYS_CONFIG_NAME string default "omap3_mvblx" diff --git a/board/nokia/rx51/Kconfig b/board/nokia/rx51/Kconfig index 41d0daae89..faa90d2533 100644 --- a/board/nokia/rx51/Kconfig +++ b/board/nokia/rx51/Kconfig @@ -1,9 +1,5 @@ if TARGET_NOKIA_RX51 -config SYS_CPU - string - default "armv7" - config SYS_BOARD string default "rx51" @@ -12,10 +8,6 @@ config SYS_VENDOR string default "nokia" -config SYS_SOC - string - default "omap3" - config SYS_CONFIG_NAME string default "nokia_rx51" diff --git a/board/overo/Kconfig b/board/overo/Kconfig index 1d4a26187d..d1ea236a8a 100644 --- a/board/overo/Kconfig +++ b/board/overo/Kconfig @@ -1,17 +1,9 @@ if TARGET_OMAP3_OVERO -config SYS_CPU - string - default "armv7" - config SYS_BOARD string default "overo" -config SYS_SOC - string - default "omap3" - config SYS_CONFIG_NAME string default "omap3_overo" diff --git a/board/pandora/Kconfig b/board/pandora/Kconfig index a36c0c8699..6f410050d2 100644 --- a/board/pandora/Kconfig +++ b/board/pandora/Kconfig @@ -1,17 +1,9 @@ if TARGET_OMAP3_PANDORA -config SYS_CPU - string - default "armv7" - config SYS_BOARD string default "pandora" -config SYS_SOC - string - default "omap3" - config SYS_CONFIG_NAME string default "omap3_pandora" diff --git a/board/technexion/tao3530/Kconfig b/board/technexion/tao3530/Kconfig index 06e56a4f8f..910a9cdaa7 100644 --- a/board/technexion/tao3530/Kconfig +++ b/board/technexion/tao3530/Kconfig @@ -1,9 +1,5 @@ if TARGET_TAO3530 -config SYS_CPU - string - default "armv7" - config SYS_BOARD string default "tao3530" @@ -12,10 +8,6 @@ config SYS_VENDOR string default "technexion" -config SYS_SOC - string - default "omap3" - config SYS_CONFIG_NAME string default "tao3530" diff --git a/board/technexion/twister/Kconfig b/board/technexion/twister/Kconfig index 1790f6d250..e6f811a19d 100644 --- a/board/technexion/twister/Kconfig +++ b/board/technexion/twister/Kconfig @@ -1,9 +1,5 @@ if TARGET_TWISTER -config SYS_CPU - string - default "armv7" - config SYS_BOARD string default "twister" @@ -12,10 +8,6 @@ config SYS_VENDOR string default "technexion" -config SYS_SOC - string - default "omap3" - config SYS_CONFIG_NAME string default "twister" diff --git a/board/teejet/mt_ventoux/Kconfig b/board/teejet/mt_ventoux/Kconfig index 96cf7c05a2..a5672049bf 100644 --- a/board/teejet/mt_ventoux/Kconfig +++ b/board/teejet/mt_ventoux/Kconfig @@ -1,9 +1,5 @@ if TARGET_MT_VENTOUX -config SYS_CPU - string - default "armv7" - config SYS_BOARD string default "mt_ventoux" @@ -12,10 +8,6 @@ config SYS_VENDOR string default "teejet" -config SYS_SOC - string - default "omap3" - config SYS_CONFIG_NAME string default "mt_ventoux" diff --git a/board/ti/am3517crane/Kconfig b/board/ti/am3517crane/Kconfig index fdb20ab6e1..c44dab5b61 100644 --- a/board/ti/am3517crane/Kconfig +++ b/board/ti/am3517crane/Kconfig @@ -1,9 +1,5 @@ if TARGET_AM3517_CRANE -config SYS_CPU - string - default "armv7" - config SYS_BOARD string default "am3517crane" @@ -12,10 +8,6 @@ config SYS_VENDOR string default "ti" -config SYS_SOC - string - default "omap3" - config SYS_CONFIG_NAME string default "am3517_crane" diff --git a/board/ti/beagle/Kconfig b/board/ti/beagle/Kconfig index 15dccdf854..10c81c2bee 100644 --- a/board/ti/beagle/Kconfig +++ b/board/ti/beagle/Kconfig @@ -1,9 +1,5 @@ if TARGET_OMAP3_BEAGLE -config SYS_CPU - string - default "armv7" - config SYS_BOARD string default "beagle" @@ -12,10 +8,6 @@ config SYS_VENDOR string default "ti" -config SYS_SOC - string - default "omap3" - config SYS_CONFIG_NAME string default "omap3_beagle" diff --git a/board/ti/evm/Kconfig b/board/ti/evm/Kconfig index e34294290e..c54ce3322b 100644 --- a/board/ti/evm/Kconfig +++ b/board/ti/evm/Kconfig @@ -1,9 +1,5 @@ if TARGET_OMAP3_EVM -config SYS_CPU - string - default "armv7" - config SYS_BOARD string default "evm" @@ -12,10 +8,6 @@ config SYS_VENDOR string default "ti" -config SYS_SOC - string - default "omap3" - config SYS_CONFIG_NAME string default "omap3_evm" @@ -24,10 +16,6 @@ endif if TARGET_OMAP3_EVM_QUICK_MMC -config SYS_CPU - string - default "armv7" - config SYS_BOARD string default "evm" @@ -36,10 +24,6 @@ config SYS_VENDOR string default "ti" -config SYS_SOC - string - default "omap3" - config SYS_CONFIG_NAME string default "omap3_evm_quick_mmc" @@ -48,10 +32,6 @@ endif if TARGET_OMAP3_EVM_QUICK_NAND -config SYS_CPU - string - default "armv7" - config SYS_BOARD string default "evm" @@ -60,10 +40,6 @@ config SYS_VENDOR string default "ti" -config SYS_SOC - string - default "omap3" - config SYS_CONFIG_NAME string default "omap3_evm_quick_nand" diff --git a/board/ti/sdp3430/Kconfig b/board/ti/sdp3430/Kconfig index 81989b7f9e..fcf732989b 100644 --- a/board/ti/sdp3430/Kconfig +++ b/board/ti/sdp3430/Kconfig @@ -1,9 +1,5 @@ if TARGET_OMAP3_SDP3430 -config SYS_CPU - string - default "armv7" - config SYS_BOARD string default "sdp3430" @@ -12,10 +8,6 @@ config SYS_VENDOR string default "ti" -config SYS_SOC - string - default "omap3" - config SYS_CONFIG_NAME string default "omap3_sdp3430" diff --git a/board/timll/devkit8000/Kconfig b/board/timll/devkit8000/Kconfig index d9c920cab0..d1603f4741 100644 --- a/board/timll/devkit8000/Kconfig +++ b/board/timll/devkit8000/Kconfig @@ -1,9 +1,5 @@ if TARGET_DEVKIT8000 -config SYS_CPU - string - default "armv7" - config SYS_BOARD string default "devkit8000" @@ -12,10 +8,6 @@ config SYS_VENDOR string default "timll" -config SYS_SOC - string - default "omap3" - config SYS_CONFIG_NAME string default "devkit8000" diff --git a/configs/am3517_crane_defconfig b/configs/am3517_crane_defconfig index ec932245f3..cf9d8c7120 100644 --- a/configs/am3517_crane_defconfig +++ b/configs/am3517_crane_defconfig @@ -1,3 +1,4 @@ CONFIG_SPL=y +S:CONFIG_ARM=y ++S:CONFIG_OMAP34XX=y +S:CONFIG_TARGET_AM3517_CRANE=y diff --git a/configs/am3517_evm_defconfig b/configs/am3517_evm_defconfig index 1fab6c1fe0..2336f1ed82 100644 --- a/configs/am3517_evm_defconfig +++ b/configs/am3517_evm_defconfig @@ -1,3 +1,4 @@ CONFIG_SPL=y +S:CONFIG_ARM=y ++S:CONFIG_OMAP34XX=y +S:CONFIG_TARGET_AM3517_EVM=y diff --git a/configs/cm_t35_defconfig b/configs/cm_t35_defconfig index 00b0590999..2bb616fb90 100644 --- a/configs/cm_t35_defconfig +++ b/configs/cm_t35_defconfig @@ -1,3 +1,4 @@ CONFIG_SPL=y +S:CONFIG_ARM=y ++S:CONFIG_OMAP34XX=y +S:CONFIG_TARGET_CM_T35=y diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig index 7c5d222d63..578ae74bba 100644 --- a/configs/devkit8000_defconfig +++ b/configs/devkit8000_defconfig @@ -1,3 +1,4 @@ CONFIG_SPL=y +S:CONFIG_ARM=y ++S:CONFIG_OMAP34XX=y +S:CONFIG_TARGET_DEVKIT8000=y diff --git a/configs/dig297_defconfig b/configs/dig297_defconfig index 9309ac2d65..95bc353926 100644 --- a/configs/dig297_defconfig +++ b/configs/dig297_defconfig @@ -1,2 +1,3 @@ CONFIG_ARM=y +CONFIG_OMAP34XX=y CONFIG_TARGET_DIG297=y diff --git a/configs/eco5pk_defconfig b/configs/eco5pk_defconfig index 79f3d5ad66..e45bdadf3f 100644 --- a/configs/eco5pk_defconfig +++ b/configs/eco5pk_defconfig @@ -1,3 +1,4 @@ CONFIG_SPL=y +S:CONFIG_ARM=y ++S:CONFIG_OMAP34XX=y +S:CONFIG_TARGET_ECO5PK=y diff --git a/configs/igep0020_defconfig b/configs/igep0020_defconfig index e99f77300a..dd56ea18c3 100644 --- a/configs/igep0020_defconfig +++ b/configs/igep0020_defconfig @@ -1,4 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0020,BOOT_ONENAND" +S:CONFIG_ARM=y ++S:CONFIG_OMAP34XX=y +S:CONFIG_TARGET_OMAP3_IGEP00X0=y diff --git a/configs/igep0020_nand_defconfig b/configs/igep0020_nand_defconfig index baa4a0a80e..da54da02ab 100644 --- a/configs/igep0020_nand_defconfig +++ b/configs/igep0020_nand_defconfig @@ -1,4 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0020,BOOT_NAND" +S:CONFIG_ARM=y ++S:CONFIG_OMAP34XX=y +S:CONFIG_TARGET_OMAP3_IGEP00X0=y diff --git a/configs/igep0030_defconfig b/configs/igep0030_defconfig index 5f404eb821..1025feddba 100644 --- a/configs/igep0030_defconfig +++ b/configs/igep0030_defconfig @@ -1,4 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0030,BOOT_ONENAND" +S:CONFIG_ARM=y ++S:CONFIG_OMAP34XX=y +S:CONFIG_TARGET_OMAP3_IGEP00X0=y diff --git a/configs/igep0030_nand_defconfig b/configs/igep0030_nand_defconfig index a43dfec4ab..b3b3366c9b 100644 --- a/configs/igep0030_nand_defconfig +++ b/configs/igep0030_nand_defconfig @@ -1,4 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0030,BOOT_NAND" +S:CONFIG_ARM=y ++S:CONFIG_OMAP34XX=y +S:CONFIG_TARGET_OMAP3_IGEP00X0=y diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig index c0d019ca8e..faa04f7ecd 100644 --- a/configs/igep0032_defconfig +++ b/configs/igep0032_defconfig @@ -1,4 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0032,BOOT_ONENAND" +S:CONFIG_ARM=y ++S:CONFIG_OMAP34XX=y +S:CONFIG_TARGET_OMAP3_IGEP00X0=y diff --git a/configs/mcx_defconfig b/configs/mcx_defconfig index a700c88ec4..c2031f85b7 100644 --- a/configs/mcx_defconfig +++ b/configs/mcx_defconfig @@ -1,3 +1,4 @@ CONFIG_SPL=y +S:CONFIG_ARM=y ++S:CONFIG_OMAP34XX=y +S:CONFIG_TARGET_MCX=y diff --git a/configs/mt_ventoux_defconfig b/configs/mt_ventoux_defconfig index 0fcad87a3c..a0678bb823 100644 --- a/configs/mt_ventoux_defconfig +++ b/configs/mt_ventoux_defconfig @@ -1,3 +1,4 @@ CONFIG_SPL=y +S:CONFIG_ARM=y ++S:CONFIG_OMAP34XX=y +S:CONFIG_TARGET_MT_VENTOUX=y diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig index 055a602efe..e03f586880 100644 --- a/configs/nokia_rx51_defconfig +++ b/configs/nokia_rx51_defconfig @@ -1,2 +1,3 @@ CONFIG_ARM=y +CONFIG_OMAP34XX=y CONFIG_TARGET_NOKIA_RX51=y diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig index a37ca60971..a3e4c2c6d6 100644 --- a/configs/omap3_beagle_defconfig +++ b/configs/omap3_beagle_defconfig @@ -1,4 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="NAND" +S:CONFIG_ARM=y ++S:CONFIG_OMAP34XX=y +S:CONFIG_TARGET_OMAP3_BEAGLE=y diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig index 284abe1b70..c749aa74b7 100644 --- a/configs/omap3_evm_defconfig +++ b/configs/omap3_evm_defconfig @@ -1,3 +1,4 @@ CONFIG_SPL=y +S:CONFIG_ARM=y ++S:CONFIG_OMAP34XX=y +S:CONFIG_TARGET_OMAP3_EVM=y diff --git a/configs/omap3_evm_quick_mmc_defconfig b/configs/omap3_evm_quick_mmc_defconfig index 5bafeacf31..e89bb82ac9 100644 --- a/configs/omap3_evm_quick_mmc_defconfig +++ b/configs/omap3_evm_quick_mmc_defconfig @@ -1,3 +1,4 @@ CONFIG_SPL=y +S:CONFIG_ARM=y ++S:CONFIG_OMAP34XX=y +S:CONFIG_TARGET_OMAP3_EVM_QUICK_MMC=y diff --git a/configs/omap3_evm_quick_nand_defconfig b/configs/omap3_evm_quick_nand_defconfig index 501e46f77c..e70fddd794 100644 --- a/configs/omap3_evm_quick_nand_defconfig +++ b/configs/omap3_evm_quick_nand_defconfig @@ -1,3 +1,4 @@ CONFIG_SPL=y +S:CONFIG_ARM=y ++S:CONFIG_OMAP34XX=y +S:CONFIG_TARGET_OMAP3_EVM_QUICK_NAND=y diff --git a/configs/omap3_ha_defconfig b/configs/omap3_ha_defconfig index a183fe71b0..50bffa90a2 100644 --- a/configs/omap3_ha_defconfig +++ b/configs/omap3_ha_defconfig @@ -1,4 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="SYS_BOARD_OMAP3_HA" +S:CONFIG_ARM=y ++S:CONFIG_OMAP34XX=y +S:CONFIG_TARGET_TAO3530=y diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig index 6278554813..5f2c063b6e 100644 --- a/configs/omap3_logic_defconfig +++ b/configs/omap3_logic_defconfig @@ -1,2 +1,3 @@ CONFIG_ARM=y +CONFIG_OMAP34XX=y CONFIG_TARGET_OMAP3_LOGIC=y diff --git a/configs/omap3_mvblx_defconfig b/configs/omap3_mvblx_defconfig index b7ddcc84b7..fb6edc252a 100644 --- a/configs/omap3_mvblx_defconfig +++ b/configs/omap3_mvblx_defconfig @@ -1,2 +1,3 @@ CONFIG_ARM=y +CONFIG_OMAP34XX=y CONFIG_TARGET_OMAP3_MVBLX=y diff --git a/configs/omap3_overo_defconfig b/configs/omap3_overo_defconfig index dca3237316..7e0d334289 100644 --- a/configs/omap3_overo_defconfig +++ b/configs/omap3_overo_defconfig @@ -1,3 +1,4 @@ CONFIG_SPL=y +S:CONFIG_ARM=y ++S:CONFIG_OMAP34XX=y +S:CONFIG_TARGET_OMAP3_OVERO=y diff --git a/configs/omap3_pandora_defconfig b/configs/omap3_pandora_defconfig index 54dab48c59..bf285378a3 100644 --- a/configs/omap3_pandora_defconfig +++ b/configs/omap3_pandora_defconfig @@ -1,2 +1,3 @@ CONFIG_ARM=y +CONFIG_OMAP34XX=y CONFIG_TARGET_OMAP3_PANDORA=y diff --git a/configs/omap3_sdp3430_defconfig b/configs/omap3_sdp3430_defconfig index 9672956a57..1172c2adc5 100644 --- a/configs/omap3_sdp3430_defconfig +++ b/configs/omap3_sdp3430_defconfig @@ -1,2 +1,3 @@ CONFIG_ARM=y +CONFIG_OMAP34XX=y CONFIG_TARGET_OMAP3_SDP3430=y diff --git a/configs/omap3_zoom1_defconfig b/configs/omap3_zoom1_defconfig index f4c8ed9703..e2d0a8c5b9 100644 --- a/configs/omap3_zoom1_defconfig +++ b/configs/omap3_zoom1_defconfig @@ -1,2 +1,3 @@ CONFIG_ARM=y +CONFIG_OMAP34XX=y CONFIG_TARGET_OMAP3_ZOOM1=y diff --git a/configs/tao3530_defconfig b/configs/tao3530_defconfig index d8b57b1242..a5113890ef 100644 --- a/configs/tao3530_defconfig +++ b/configs/tao3530_defconfig @@ -1,3 +1,4 @@ CONFIG_SPL=y +S:CONFIG_ARM=y ++S:CONFIG_OMAP34XX=y +S:CONFIG_TARGET_TAO3530=y diff --git a/configs/tricorder_defconfig b/configs/tricorder_defconfig index 80c2df4937..7ea5e02f5e 100644 --- a/configs/tricorder_defconfig +++ b/configs/tricorder_defconfig @@ -1,3 +1,4 @@ CONFIG_SPL=y +S:CONFIG_ARM=y ++S:CONFIG_OMAP34XX=y +S:CONFIG_TARGET_TRICORDER=y diff --git a/configs/tricorder_flash_defconfig b/configs/tricorder_flash_defconfig index 6715e71f97..f6e1c464aa 100644 --- a/configs/tricorder_flash_defconfig +++ b/configs/tricorder_flash_defconfig @@ -1,4 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="FLASHCARD" +S:CONFIG_ARM=y ++S:CONFIG_OMAP34XX=y +S:CONFIG_TARGET_TRICORDER=y diff --git a/configs/twister_defconfig b/configs/twister_defconfig index 27e836490e..902373601a 100644 --- a/configs/twister_defconfig +++ b/configs/twister_defconfig @@ -1,3 +1,4 @@ CONFIG_SPL=y +S:CONFIG_ARM=y ++S:CONFIG_OMAP34XX=y +S:CONFIG_TARGET_TWISTER=y diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index 898ed2ee18..fcb4033c01 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -17,7 +17,6 @@ * High Level Configuration Options */ #define CONFIG_OMAP 1 /* in a TI OMAP core */ -#define CONFIG_OMAP34XX 1 /* which is a 34XX */ #define CONFIG_OMAP3_AM3517CRANE 1 /* working with CRANEBOARD */ #define CONFIG_OMAP_COMMON diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 1e2d55bec5..c5d64ca59e 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -17,7 +17,6 @@ * High Level Configuration Options */ #define CONFIG_OMAP 1 /* in a TI OMAP core */ -#define CONFIG_OMAP34XX 1 /* which is a 34XX */ #define CONFIG_OMAP3_AM3517EVM 1 /* working with AM3517EVM */ #define CONFIG_OMAP_COMMON diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index c63608c189..70df1ebc67 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -21,7 +21,6 @@ * High Level Configuration Options */ #define CONFIG_OMAP /* in a TI OMAP core */ -#define CONFIG_OMAP34XX /* which is a 34XX */ #define CONFIG_OMAP_GPIO #define CONFIG_CMD_GPIO #define CONFIG_CM_T3X /* working with CM-T35 and CM-T3730 */ diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 69c51bc4c3..7ab6d51642 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -17,7 +17,6 @@ /* High Level Configuration Options */ #define CONFIG_OMAP 1 /* in a TI OMAP core */ -#define CONFIG_OMAP34XX 1 /* which is a 34XX */ #define CONFIG_OMAP3_DEVKIT8000 1 /* working with DevKit8000 */ #define CONFIG_MACH_TYPE MACH_TYPE_DEVKIT8000 #define CONFIG_OMAP_GPIO diff --git a/include/configs/dig297.h b/include/configs/dig297.h index 7e47c56453..c8739ed294 100644 --- a/include/configs/dig297.h +++ b/include/configs/dig297.h @@ -28,7 +28,6 @@ * High Level Configuration Options */ #define CONFIG_OMAP /* in a TI OMAP core */ -#define CONFIG_OMAP34XX /* which is a 34XX */ #define CONFIG_OMAP_GPIO #define CONFIG_OMAP_COMMON diff --git a/include/configs/mcx.h b/include/configs/mcx.h index dff895a965..cd85a6c9e8 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -13,7 +13,6 @@ * High Level Configuration Options */ #define CONFIG_OMAP /* in a TI OMAP core */ -#define CONFIG_OMAP34XX /* which is a 34XX */ #define CONFIG_OMAP3_MCX /* working with mcx */ #define CONFIG_OMAP_GPIO #define CONFIG_OMAP_COMMON diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index 43c1617a5e..982b689f3c 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -24,7 +24,6 @@ */ #define CONFIG_OMAP /* in a TI OMAP core */ -#define CONFIG_OMAP34XX /* which is a 34XX */ #define CONFIG_OMAP3430 /* which is in a 3430 */ #define CONFIG_OMAP3_RX51 /* working with RX51 */ #define CONFIG_SYS_L2CACHE_OFF /* pretend there is no L2 CACHE */ diff --git a/include/configs/omap3_evm_common.h b/include/configs/omap3_evm_common.h index eef4230e64..8885e17581 100644 --- a/include/configs/omap3_evm_common.h +++ b/include/configs/omap3_evm_common.h @@ -13,7 +13,6 @@ * High level configuration options */ #define CONFIG_OMAP /* This is TI OMAP core */ -#define CONFIG_OMAP34XX /* belonging to 34XX family */ #define CONFIG_OMAP_GPIO #define CONFIG_OMAP_COMMON diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index 717c935d2c..aeb385f5ff 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -15,7 +15,6 @@ * High Level Configuration Options */ #define CONFIG_OMAP /* in a TI OMAP core */ -#define CONFIG_OMAP34XX /* which is a 34XX */ #define CONFIG_OMAP3_LOGIC /* working with Logic OMAP boards */ #define CONFIG_OMAP_GPIO #define CONFIG_OMAP_COMMON diff --git a/include/configs/omap3_mvblx.h b/include/configs/omap3_mvblx.h index a3dcb152d3..f3c21c4580 100644 --- a/include/configs/omap3_mvblx.h +++ b/include/configs/omap3_mvblx.h @@ -20,7 +20,6 @@ */ #define CONFIG_ARMV7 1 /* This is an ARM V7 CPU core */ #define CONFIG_OMAP 1 /* in a TI OMAP core */ -#define CONFIG_OMAP34XX 1 /* which is a 34XX */ #define CONFIG_MVBLX 1 /* working with mvBlueLYNX-X */ #define CONFIG_MACH_TYPE MACH_TYPE_MVBLX #define CONFIG_OMAP_GPIO diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h index c22c1fc6aa..45feeb5773 100644 --- a/include/configs/omap3_pandora.h +++ b/include/configs/omap3_pandora.h @@ -14,7 +14,6 @@ * High Level Configuration Options */ #define CONFIG_OMAP 1 /* in a TI OMAP core */ -#define CONFIG_OMAP34XX 1 /* which is a 34XX */ #define CONFIG_OMAP3_PANDORA 1 /* working with pandora */ #define CONFIG_OMAP_GPIO #define CONFIG_OMAP_COMMON diff --git a/include/configs/omap3_sdp3430.h b/include/configs/omap3_sdp3430.h index a3e8a59972..ac307eb456 100644 --- a/include/configs/omap3_sdp3430.h +++ b/include/configs/omap3_sdp3430.h @@ -21,7 +21,6 @@ * High Level Configuration Options */ #define CONFIG_OMAP 1 /* in a TI OMAP core */ -#define CONFIG_OMAP34XX 1 /* which is a 34XX */ #define CONFIG_OMAP3_3430SDP 1 /* working with SDP Rev2 */ #define CONFIG_OMAP_COMMON diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index bcf0a63595..9fbe68a8a2 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -14,7 +14,6 @@ * High Level Configuration Options */ #define CONFIG_OMAP /* in a TI OMAP core */ -#define CONFIG_OMAP34XX /* which is a 34XX */ #define CONFIG_OMAP_GPIO #define CONFIG_OMAP_COMMON #define CONFIG_SYS_GENERIC_BOARD diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index 174bfe50a9..8d2db27ecb 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -18,7 +18,6 @@ */ #define CONFIG_ARMV7 /* This is an ARM V7 CPU core */ #define CONFIG_OMAP /* in a TI OMAP core */ -#define CONFIG_OMAP34XX /* which is a 34XX */ #define CONFIG_OMAP_GPIO #define CONFIG_OMAP_COMMON diff --git a/include/configs/ti_omap3_common.h b/include/configs/ti_omap3_common.h index ade35d295a..3b19d3d6ba 100644 --- a/include/configs/ti_omap3_common.h +++ b/include/configs/ti_omap3_common.h @@ -14,7 +14,6 @@ #ifndef __CONFIG_TI_OMAP3_COMMON_H__ #define __CONFIG_TI_OMAP3_COMMON_H__ -#define CONFIG_OMAP34XX #include #include diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index cc0d172115..6ddf3d5d5e 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -18,7 +18,6 @@ /* High Level Configuration Options */ #define CONFIG_OMAP /* in a TI OMAP core */ -#define CONFIG_OMAP34XX /* which is a 34XX */ #define CONFIG_OMAP_COMMON #define CONFIG_MACH_TYPE MACH_TYPE_TRICORDER -- 2.25.1