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>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 24614e3ead39c5c0f2fa2133a009ed5a111f8727..3f38b0422689887dd7378fcdacc2ecd70c6fc798 100644 (file)
--- 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 (file)
index 0000000..6578f0c
--- /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 fb1b30876e79c41054a930c1c96b2eb055944870..0af1b30318daae616a1bb1fcf1d12b425e21ac1e 100644 (file)
--- 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 d7a2bf24ab997d1a5239bf13b8f6d7dbeb34a32c..4c5ea09b968fa236124032d244e47a48c4d555bd 100644 (file)
--- 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 fd960bc9464dcc12fe5023a64eecb3437d75c293..06de69261d5994d8c4428b2a340533654aea7a9c 100644 (file)
--- 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 a1e06e7f2f03faa148a0170632e1de26a0e5a029..5147fd76b86985694b1536576d6518c532d176b4 100644 (file)
--- 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 1e2c6796495fa924d7d09c59975757e4e4c8c80d..343ff4d0f080e5a93cea8d4c6de70cb03c622848 100644 (file)
--- 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 c9f2969cb8d2fecb4ec530f647653c509cceff13..c9352fdc8899e18f1b6908bffded3cf8af53e135 100644 (file)
--- 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 9bc5ae58f2539a10b73a22988f7db331cf3263bd..1012d3ddc5a0bd143acba1f19a436f1b08f1e31a 100644 (file)
--- 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 daaefa6d86e78ecc38985aa8fa0c16facc218dd7..adeaf4d033ba24ac27aaa0f350f01369fb3a46d1 100644 (file)
--- 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 3199130604f67b33938ddb5a74b73861eeac8832..e9a56230ced5b6afc6073f431721e2c2feb46754 100644 (file)
--- 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 d89c1e3b9dc3bd319e62406d11056d3f7fb374bb..69f05661cbdc5595502448db0857ff6d8401d40e 100644 (file)
--- 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 41d0daae8915bc4b5c0e498619d290c44ce542fa..faa90d253390089e7332893097f085a9563c0d1f 100644 (file)
--- 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 1d4a26187db60ad3981e569a197370f3a1c15660..d1ea236a8ab590201e6da1800a454dcaefc39b27 100644 (file)
--- 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 a36c0c86993ef10e964d4f361d709dc0e9eb37f6..6f410050d24a950b0597d6438f02b5a1b8ae2222 100644 (file)
--- 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 06e56a4f8f3e4f893cf97137ab315cc91d2d629e..910a9cdaa7b545dcd1bda03d7a78549b22f67e88 100644 (file)
--- 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 1790f6d250cca512650aa44e9b2c9ecc5e0b91d6..e6f811a19dbccacbbcc25802264ec2a573868e5b 100644 (file)
--- 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 96cf7c05a24f14f989b6494ba73ec2092cf4a5b9..a5672049bf872b081175f492a7166dc5ab671bfb 100644 (file)
--- 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 fdb20ab6e1e6d636a72e3187439d73c43b667ee6..c44dab5b61e343fcf6649917056c0c08b72bbf62 100644 (file)
--- 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 15dccdf854718f7cbe10a639beb9306bc821491b..10c81c2bee2e94cab92c316edc154c01f2750232 100644 (file)
--- 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 e34294290e3e1aea9dc47cddf499f3f4b1b3c0be..c54ce3322bdf44fc431f9bad91c4841f67f2b8e0 100644 (file)
--- 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 81989b7f9eab40192ebd389641b273876898a8ff..fcf732989bb0ab1fdcf1f8b895e443a3e1d49916 100644 (file)
--- 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 d9c920cab0331f1b488d1ded70fb32a0b8001f4a..d1603f4741e9f5dbfd3df5d515d713fad742cd3f 100644 (file)
--- 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 ec932245f3f995e389f87328c60c32a60305fa18..cf9d8c7120e666125613f00503adbe561cbbe4bd 100644 (file)
--- 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 1fab6c1fe0b55d40043434abd1512809e589040c..2336f1ed829a1f1fc45e0b3d923538f0d42aa804 100644 (file)
--- 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 00b059099944b61da003b41f66d919966dc10ab2..2bb616fb9035c47189c6f21d2cd2140c1e150321 100644 (file)
--- 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 7c5d222d631c3fe34166482a3c1f833d46a9eac8..578ae74bbad1e70eeca115edcba7a5fb1fbf35ef 100644 (file)
--- 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 9309ac2d65112e2eee5ee01954b6d1a67b77b6fa..95bc35392670e98e1c2a51e00843d4a32d994a48 100644 (file)
--- 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 79f3d5ad662a54a6269468dae92b69a711adb55b..e45bdadf3fd8a8622d3fea0670bd5ba0c0506fab 100644 (file)
--- 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 e99f77300a8c1558874fa5e5f2ae8d52713971ca..dd56ea18c39e5ff0a17438d37479a3c2d99e3ae6 100644 (file)
--- 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 baa4a0a80e7a7554da6111d6ec24e9ef9105e74b..da54da02ab9bc15516ce63c5616a6c21974bd1ef 100644 (file)
--- 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 5f404eb82172ee439ab420c278fd2bf620487ca3..1025feddbacb379a6119cb3ec27f14da1b9c5628 100644 (file)
--- 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 a43dfec4abc9ecd5455f767dd72577997a5d565b..b3b3366c9bdc111cffffc983e56c11b866d0cc98 100644 (file)
--- 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 c0d019ca8e0e21f71ba1476a61e8334a306b7c5a..faa04f7ecdab418b3c4d2b9c8a873f9b26af32c8 100644 (file)
--- 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 a700c88ec4847df8d5713e05c0c5a09d61dfa900..c2031f85b78db3d20d089bee068352e2ef10292c 100644 (file)
--- 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 0fcad87a3c9cec1cee753410758fe290dd795e9d..a0678bb8230634fce62cdbb0bdcd6e74ab997e8e 100644 (file)
--- 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 055a602efe049adbfc53156c0b8dca6781a62d9c..e03f586880829b5018c6237af72acc5680d7584e 100644 (file)
--- 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 a37ca60971e0d0212d0739646148bf0c3dcbd25c..a3e4c2c6d624a89d43a9161871df754cbaa037c2 100644 (file)
--- 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 284abe1b70d022cf9416e3d98e6bd9ce0bf74e8a..c749aa74b73429728b941ba0ee877ab87e4d41e7 100644 (file)
--- 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 5bafeacf31ea3f6a15a3166c3e5676ccbc16f06f..e89bb82ac9198909762c9a15702ed51f467896ec 100644 (file)
--- 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 501e46f77ca74cb951f52ede8c9ac66b1755c0ad..e70fddd79441c6aca3609e92b287054c086faa76 100644 (file)
--- 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 a183fe71b0ee42bfd2bfc02d4689db3bbe1d085a..50bffa90a2e576f820c03d52978783653ea0fd4a 100644 (file)
--- 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 62785548136b5c8bdbfd494b11a37d0348ef6e9d..5f2c063b6ec48ce3af75f56d8f74d0a0d4f1ca5e 100644 (file)
--- 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 b7ddcc84b721d7820d489d73acbaa58b885cfb28..fb6edc252af6f2cba98da1359bd7d062121cb1fe 100644 (file)
--- 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 dca3237316aa7232dd5620cfa102ebf2f0342639..7e0d33428933184c3d8b909cc90ec617ee5024c8 100644 (file)
--- 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 54dab48c596673d12904b3870a2150f4aa31bc87..bf285378a3f04a62f9500e16d35ece68bf5333cd 100644 (file)
--- 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 9672956a5701e6a55bcfd21a6d75a9cbaad6a9b0..1172c2adc597fe7cf407af69710d93a9e89a74f7 100644 (file)
--- 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 f4c8ed97033f6bd315f0300d115c8f2bac961ae6..e2d0a8c5b96f468d9efc777480152d8811dfb9be 100644 (file)
--- 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 d8b57b1242e4deb963df2fd2257d9076475dd118..a5113890ef3f6c063874accda87f0f7eab318c9a 100644 (file)
--- 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 80c2df493750ddac3a16abb9a9d670e2fccbd353..7ea5e02f5ed1ebfcef7b1ef85931c2282ff5ddee 100644 (file)
--- 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 6715e71f97914d2dda3becc0a8fb75d32906c282..f6e1c464aadd806d744c1e14567716fbd2d9c967 100644 (file)
--- 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 27e836490e8a3a6bf222800852b01a0aa9009102..902373601ade33a0771887d640c164383e918505 100644 (file)
--- 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 898ed2ee18542085aa03b0ffcb462dc43550668e..fcb4033c01f3d2d621d4640ded2e6cf81b8ce756 100644 (file)
--- 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 1e2d55bec577e3678dc5a235a52bf5c926d10871..c5d64ca59ed1956c038c6c41a354539273f928c4 100644 (file)
--- 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 c63608c189fd6b415cbb3b036fc0165479fe1c09..70df1ebc67752ed0dc5c342ce612188387cab934 100644 (file)
--- 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 69c51bc4c30c49e810f3dc8dde8a6f7b237fbe5d..7ab6d51642d5fb1457bf33537482fdd9d1e8d9ff 100644 (file)
--- 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 7e47c56453074f1bb5fca5fbd8503960610b399e..c8739ed29490e58864b34f6bba55ca8691c5837d 100644 (file)
--- 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 dff895a96511068e2d970515f776b7ce1d2b99af..cd85a6c9e89e0982c8bda7d518db58a95dc85d56 100644 (file)
--- 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 43c1617a5efe7fc3e2490cd31de7017c0537c083..982b689f3cb481b65691db743f9d388dbc7379ac 100644 (file)
--- 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 eef4230e64ce9432a706dc6fe913ae82a297b217..8885e175810620538e1da86eec724f6a21ecb5b9 100644 (file)
--- 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 717c935d2c4054496585858ea853e05bfb074df2..aeb385f5ff6b4d289c085a2f33897b3eded01ece 100644 (file)
--- 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 a3dcb152d3a82fd32481abe4ab47963b8d13789b..f3c21c4580aa5c067d0de68b3cdb0a302bdc3876 100644 (file)
--- 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 c22c1fc6aaaed83fb13f473b65b3fe94f8df85c9..45feeb577320a847ac6abed9bf5c1ae83f09c03d 100644 (file)
--- 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 a3e8a5997288ea8061238810e663afe60c99e633..ac307eb45629bafc3c99fdcc0cdcd8eab95a12ca 100644 (file)
--- 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 bcf0a635959eac3e8b1783a2ec2e90f36bded5cb..9fbe68a8a2f22b1506c3ef327d442f0ccf75f679 100644 (file)
--- 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 174bfe50a9d98fa954ee38dc478f5066661c3bab..8d2db27ecb98f6688dd66936c485faeb4d35a8cf 100644 (file)
--- 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 ade35d295a23c59708f2192ddfe6be95ff880219..3b19d3d6baf4c46f7a930e5c74c7e1afdea1f6a3 100644 (file)
--- 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 <asm/arch/cpu.h>
 #include <asm/arch/omap3.h>

diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index cc0d172115f9e8be45b8e5205a4ac7a81230019d..6ddf3d5d5e4329dced01e2e7ff301fac31370486 100644 (file)
--- 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