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 <yamada.m@jp.panasonic.com>
Reviewed-by: Tom Rini <trini@ti.com>

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"

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

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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

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

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

configs/devkit8000_defconfig

@@ -1,3 +1,4 @@
 CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_OMAP34XX=y
 +S:CONFIG_TARGET_DEVKIT8000=y

configs/dig297_defconfig

@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_OMAP34XX=y
 CONFIG_TARGET_DIG297=y

configs/eco5pk_defconfig

@@ -1,3 +1,4 @@
 CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_OMAP34XX=y
 +S:CONFIG_TARGET_ECO5PK=y

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

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

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

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

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

configs/mcx_defconfig

@@ -1,3 +1,4 @@
 CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_OMAP34XX=y
 +S:CONFIG_TARGET_MCX=y

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

configs/nokia_rx51_defconfig

@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_OMAP34XX=y
 CONFIG_TARGET_NOKIA_RX51=y

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

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

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

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

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

configs/omap3_logic_defconfig

@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_LOGIC=y

configs/omap3_mvblx_defconfig

@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_MVBLX=y

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

configs/omap3_pandora_defconfig

@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_PANDORA=y

configs/omap3_sdp3430_defconfig

@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_SDP3430=y

configs/omap3_zoom1_defconfig

@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_ZOOM1=y

configs/tao3530_defconfig

@@ -1,3 +1,4 @@
 CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_OMAP34XX=y
 +S:CONFIG_TARGET_TAO3530=y

configs/tricorder_defconfig

@@ -1,3 +1,4 @@
 CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_OMAP34XX=y
 +S:CONFIG_TARGET_TRICORDER=y

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

configs/twister_defconfig

@@ -1,3 +1,4 @@
 CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_OMAP34XX=y
 +S:CONFIG_TARGET_TWISTER=y

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
 

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
 

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 */

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

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
 

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

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 */

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
 

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

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

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

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
 

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

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

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 <asm/arch/cpu.h>
 #include <asm/arch/omap3.h>

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