kirkwood: kconfig: refactor Kconfig and defconfig

Becuase the board select menu in arch/arm/Kconfig is too big,
move the KirkWood board select menu to kirkwood/Kconfig.

Consolidate also common settings (CONFIG_SYS_CPU="arm926ejs" and
CONFIG_SYS_SOC="kirkwood").

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Prafulla Wadasdkar <prafulla@marvell.com>
Cc: Luka Perkov <luka@openwrt.org>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 4e9e26fbc3da27b235e1c8476adce3fc21af0055..8c5d43d803052626e55f16642d3fb30390d8e600 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -179,59 +179,8 @@ config TARGET_ENBW_CMC
 config TARGET_CALIMAIN
        bool "Support calimain"
 
-config TARGET_LSXL
-       bool "Support lsxl"
-
-config TARGET_POGO_E02
-       bool "Support pogo_e02"
-
-config TARGET_DNS325
-       bool "Support dns325"
-
-config TARGET_ICONNECT
-       bool "Support iconnect"
-
-config TARGET_TK71
-       bool "Support tk71"
-
-config TARGET_KM_KIRKWOOD
-       bool "Support km_kirkwood"
-
-config TARGET_NET2BIG_V2
-       bool "Support net2big_v2"
-
-config TARGET_NETSPACE_V2
-       bool "Support netspace_v2"
-
-config TARGET_WIRELESS_SPACE
-       bool "Support wireless_space"
-
-config TARGET_DREAMPLUG
-       bool "Support dreamplug"
-
-config TARGET_GURUPLUG
-       bool "Support guruplug"
-
-config TARGET_MV88F6281GTW_GE
-       bool "Support mv88f6281gtw_ge"
-
-config TARGET_OPENRD
-       bool "Support openrd"
-
-config TARGET_RD6281A
-       bool "Support rd6281a"
-
-config TARGET_SHEEVAPLUG
-       bool "Support sheevaplug"
-
-config TARGET_IB62X0
-       bool "Support ib62x0"
-
-config TARGET_DOCKSTAR
-       bool "Support dockstar"
-
-config TARGET_GOFLEXHOME
-       bool "Support goflexhome"
+config KIRKWOOD
+       bool "Marvell Kirkwood"
 
 config TARGET_DEVKIT3250
        bool "Support devkit3250"
@@ -710,6 +659,8 @@ config TARGET_JORNADA
 
 endchoice
 
+source "arch/arm/cpu/arm926ejs/kirkwood/Kconfig"
+
 source "arch/arm/cpu/armv7/rmobile/Kconfig"
 
 source "arch/arm/cpu/armv7/tegra-common/Kconfig"
@@ -727,20 +678,9 @@ source "board/BuS/eb_cpux9k2/Kconfig"
 source "board/BuS/vl_ma2sc/Kconfig"
 source "board/CarMediaLab/flea3/Kconfig"
 source "board/LaCie/edminiv2/Kconfig"
-source "board/LaCie/net2big_v2/Kconfig"
-source "board/LaCie/netspace_v2/Kconfig"
-source "board/LaCie/wireless_space/Kconfig"
 source "board/Marvell/aspenite/Kconfig"
 source "board/Marvell/dkb/Kconfig"
-source "board/Marvell/dreamplug/Kconfig"
 source "board/Marvell/gplugd/Kconfig"
-source "board/Marvell/guruplug/Kconfig"
-source "board/Marvell/mv88f6281gtw_ge/Kconfig"
-source "board/Marvell/openrd/Kconfig"
-source "board/Marvell/rd6281a/Kconfig"
-source "board/Marvell/sheevaplug/Kconfig"
-source "board/Seagate/dockstar/Kconfig"
-source "board/Seagate/goflexhome/Kconfig"
 source "board/afeb9260/Kconfig"
 source "board/ait/cam_enc_4xx/Kconfig"
 source "board/altera/socfpga/Kconfig"
@@ -766,12 +706,10 @@ source "board/boundary/nitrogen6x/Kconfig"
 source "board/broadcom/bcm28155_ap/Kconfig"
 source "board/broadcom/bcm958300k/Kconfig"
 source "board/broadcom/bcm958622hr/Kconfig"
-source "board/buffalo/lsxl/Kconfig"
 source "board/calao/sbc35_a9g20/Kconfig"
 source "board/calao/tny_a9260/Kconfig"
 source "board/calao/usb_a9263/Kconfig"
 source "board/cirrus/edb93xx/Kconfig"
-source "board/cloudengines/pogo_e02/Kconfig"
 source "board/cm4008/Kconfig"
 source "board/cm41xx/Kconfig"
 source "board/comelit/dig297/Kconfig"
@@ -781,7 +719,6 @@ source "board/compulab/cm_t54/Kconfig"
 source "board/congatec/cgtqmx6eval/Kconfig"
 source "board/corscience/tricorder/Kconfig"
 source "board/creative/xfi3/Kconfig"
-source "board/d-link/dns325/Kconfig"
 source "board/davedenx/qong/Kconfig"
 source "board/davinci/da8xxevm/Kconfig"
 source "board/davinci/dm355evm/Kconfig"
@@ -833,13 +770,10 @@ source "board/highbank/Kconfig"
 source "board/htkw/mcx/Kconfig"
 source "board/icpdas/lp8x4x/Kconfig"
 source "board/imx31_phycore/Kconfig"
-source "board/iomega/iconnect/Kconfig"
 source "board/isee/igep0033/Kconfig"
 source "board/isee/igep00x0/Kconfig"
 source "board/jornada/Kconfig"
-source "board/karo/tk71/Kconfig"
 source "board/karo/tx25/Kconfig"
-source "board/keymile/km_arm/Kconfig"
 source "board/logicpd/am3517evm/Kconfig"
 source "board/logicpd/imx27lite/Kconfig"
 source "board/logicpd/imx31_litekit/Kconfig"
@@ -858,7 +792,6 @@ source "board/pandora/Kconfig"
 source "board/phytec/pcm051/Kconfig"
 source "board/ppcag/bg0900/Kconfig"
 source "board/pxa255_idp/Kconfig"
-source "board/raidsonic/ib62x0/Kconfig"
 source "board/raspberrypi/rpi_b/Kconfig"
 source "board/ronetix/pm9261/Kconfig"
 source "board/ronetix/pm9263/Kconfig"

diff --git a/arch/arm/cpu/arm926ejs/kirkwood/Kconfig b/arch/arm/cpu/arm926ejs/kirkwood/Kconfig
new file mode 100644 (file)
index 0000000..58867f3
--- /dev/null
+++ b/arch/arm/cpu/arm926ejs/kirkwood/Kconfig
@@ -0,0 +1,89 @@
+if KIRKWOOD
+
+choice
+       prompt "Marvell Kirkwood board select"
+
+config TARGET_OPENRD
+       bool "Marvell OpenRD Board"
+
+config TARGET_MV88F6281GTW_GE
+       bool "MV88f6281GTW_GE Board"
+
+config TARGET_RD6281A
+       bool "RD6281A Board"
+
+config TARGET_DREAMPLUG
+       bool "DreamPlug Board"
+
+config TARGET_GURUPLUG
+       bool "GuruPlug Board"
+
+config TARGET_SHEEVAPLUG
+       bool "SheevaPlug Board"
+
+config TARGET_LSXL
+       bool "lsxl Board"
+
+config TARGET_POGO_E02
+       bool "pogo_e02 Board"
+
+config TARGET_DNS325
+       bool "dns325 Board"
+
+config TARGET_ICONNECT
+       bool "iconnect Board"
+
+config TARGET_TK71
+       bool "TK71 Board"
+
+config TARGET_KM_KIRKWOOD
+       bool "KM_KIRKWOOD Board"
+
+config TARGET_NET2BIG_V2
+       bool "LaCie 2Big Network v2 NAS Board"
+
+config TARGET_NETSPACE_V2
+       bool "LaCie netspace_v2 Board"
+
+config TARGET_WIRELESS_SPACE
+       bool "LaCie Wireless_space Board"
+
+config TARGET_IB62X0
+       bool "ib62x0 Board"
+
+config TARGET_DOCKSTAR
+       bool "Dockstar Board"
+
+config TARGET_GOFLEXHOME
+       bool "GoFlex Home Board"
+
+endchoice
+
+config SYS_CPU
+       string
+       default "arm926ejs"
+
+config SYS_SOC
+       string
+       default "kirkwood"
+
+source "board/Marvell/openrd/Kconfig"
+source "board/Marvell/mv88f6281gtw_ge/Kconfig"
+source "board/Marvell/rd6281a/Kconfig"
+source "board/Marvell/dreamplug/Kconfig"
+source "board/Marvell/guruplug/Kconfig"
+source "board/Marvell/sheevaplug/Kconfig"
+source "board/buffalo/lsxl/Kconfig"
+source "board/cloudengines/pogo_e02/Kconfig"
+source "board/d-link/dns325/Kconfig"
+source "board/iomega/iconnect/Kconfig"
+source "board/karo/tk71/Kconfig"
+source "board/keymile/km_arm/Kconfig"
+source "board/LaCie/net2big_v2/Kconfig"
+source "board/LaCie/netspace_v2/Kconfig"
+source "board/LaCie/wireless_space/Kconfig"
+source "board/raidsonic/ib62x0/Kconfig"
+source "board/Seagate/dockstar/Kconfig"
+source "board/Seagate/goflexhome/Kconfig"
+
+endif

diff --git a/board/LaCie/net2big_v2/Kconfig b/board/LaCie/net2big_v2/Kconfig
index 867d0d38420245457c71e5c3c4dc72300e40ebfe..e8eb9ad5bc455662c751f75785f4d98df37b9500 100644 (file)
--- a/board/LaCie/net2big_v2/Kconfig
+++ b/board/LaCie/net2big_v2/Kconfig
@@ -1,9 +1,5 @@
 if TARGET_NET2BIG_V2
 
-config SYS_CPU
-       string
-       default "arm926ejs"
-
 config SYS_BOARD
        string
        default "net2big_v2"
@@ -12,10 +8,6 @@ config SYS_VENDOR
        string
        default "LaCie"
 
-config SYS_SOC
-       string
-       default "kirkwood"
-
 config SYS_CONFIG_NAME
        string
        default "lacie_kw"

diff --git a/board/LaCie/netspace_v2/Kconfig b/board/LaCie/netspace_v2/Kconfig
index fb6fbef92c8ba2624081a7d55d229ca212fc08e8..6242a42389ac12ecdf2f079840dbbb06110a65cb 100644 (file)
--- a/board/LaCie/netspace_v2/Kconfig
+++ b/board/LaCie/netspace_v2/Kconfig
@@ -1,9 +1,5 @@
 if TARGET_NETSPACE_V2
 
-config SYS_CPU
-       string
-       default "arm926ejs"
-
 config SYS_BOARD
        string
        default "netspace_v2"
@@ -12,10 +8,6 @@ config SYS_VENDOR
        string
        default "LaCie"
 
-config SYS_SOC
-       string
-       default "kirkwood"
-
 config SYS_CONFIG_NAME
        string
        default "lacie_kw"

diff --git a/board/LaCie/wireless_space/Kconfig b/board/LaCie/wireless_space/Kconfig
index 4815cdeed30b5080bb5a3c5bd26aebb33a6c8754..ea6850f47723ef032a6fb615f8a9f103686e5299 100644 (file)
--- a/board/LaCie/wireless_space/Kconfig
+++ b/board/LaCie/wireless_space/Kconfig
@@ -1,9 +1,5 @@
 if TARGET_WIRELESS_SPACE
 
-config SYS_CPU
-       string
-       default "arm926ejs"
-
 config SYS_BOARD
        string
        default "wireless_space"
@@ -12,10 +8,6 @@ config SYS_VENDOR
        string
        default "LaCie"
 
-config SYS_SOC
-       string
-       default "kirkwood"
-
 config SYS_CONFIG_NAME
        string
        default "wireless_space"

diff --git a/board/Marvell/dreamplug/Kconfig b/board/Marvell/dreamplug/Kconfig
index e0673181636dfe38a8a4d8ed0b7c479c2b7bc2b4..afaddf4a81fb558e6f43ee7efd1de7d6ba9cff49 100644 (file)
--- a/board/Marvell/dreamplug/Kconfig
+++ b/board/Marvell/dreamplug/Kconfig
@@ -1,9 +1,5 @@
 if TARGET_DREAMPLUG
 
-config SYS_CPU
-       string
-       default "arm926ejs"
-
 config SYS_BOARD
        string
        default "dreamplug"
@@ -12,10 +8,6 @@ config SYS_VENDOR
        string
        default "Marvell"
 
-config SYS_SOC
-       string
-       default "kirkwood"
-
 config SYS_CONFIG_NAME
        string
        default "dreamplug"

diff --git a/board/Marvell/guruplug/Kconfig b/board/Marvell/guruplug/Kconfig
index fce8562187e2ba7c363511c86fa68ebe1c3b844f..0b10e9f7742fca356cbb7576ffc5190c208f9f4a 100644 (file)
--- a/board/Marvell/guruplug/Kconfig
+++ b/board/Marvell/guruplug/Kconfig
@@ -1,9 +1,5 @@
 if TARGET_GURUPLUG
 
-config SYS_CPU
-       string
-       default "arm926ejs"
-
 config SYS_BOARD
        string
        default "guruplug"
@@ -12,10 +8,6 @@ config SYS_VENDOR
        string
        default "Marvell"
 
-config SYS_SOC
-       string
-       default "kirkwood"
-
 config SYS_CONFIG_NAME
        string
        default "guruplug"

diff --git a/board/Marvell/mv88f6281gtw_ge/Kconfig b/board/Marvell/mv88f6281gtw_ge/Kconfig
index 17adab09e9902ce023cb3e39416fdaf84b202f45..49654fe7696e38eb5be375b77e095c37b5e91f07 100644 (file)
--- a/board/Marvell/mv88f6281gtw_ge/Kconfig
+++ b/board/Marvell/mv88f6281gtw_ge/Kconfig
@@ -1,9 +1,5 @@
 if TARGET_MV88F6281GTW_GE
 
-config SYS_CPU
-       string
-       default "arm926ejs"
-
 config SYS_BOARD
        string
        default "mv88f6281gtw_ge"
@@ -12,10 +8,6 @@ config SYS_VENDOR
        string
        default "Marvell"
 
-config SYS_SOC
-       string
-       default "kirkwood"
-
 config SYS_CONFIG_NAME
        string
        default "mv88f6281gtw_ge"

diff --git a/board/Marvell/openrd/Kconfig b/board/Marvell/openrd/Kconfig
index 2dfed34dc89d9bdaadf6292fcdd2d07efe752ba1..7032ba57ce4f24ebc3d49dbdf85f88a8a20849cc 100644 (file)
--- a/board/Marvell/openrd/Kconfig
+++ b/board/Marvell/openrd/Kconfig
@@ -1,9 +1,5 @@
 if TARGET_OPENRD
 
-config SYS_CPU
-       string
-       default "arm926ejs"
-
 config SYS_BOARD
        string
        default "openrd"
@@ -12,10 +8,6 @@ config SYS_VENDOR
        string
        default "Marvell"
 
-config SYS_SOC
-       string
-       default "kirkwood"
-
 config SYS_CONFIG_NAME
        string
        default "openrd"

diff --git a/board/Marvell/rd6281a/Kconfig b/board/Marvell/rd6281a/Kconfig
index ae753b036b524591baf9d51444eb3217a3ae05ed..e8702a7d194776eb8942fbf4f7d6ea456eb20ff7 100644 (file)
--- a/board/Marvell/rd6281a/Kconfig
+++ b/board/Marvell/rd6281a/Kconfig
@@ -1,9 +1,5 @@
 if TARGET_RD6281A
 
-config SYS_CPU
-       string
-       default "arm926ejs"
-
 config SYS_BOARD
        string
        default "rd6281a"
@@ -12,10 +8,6 @@ config SYS_VENDOR
        string
        default "Marvell"
 
-config SYS_SOC
-       string
-       default "kirkwood"
-
 config SYS_CONFIG_NAME
        string
        default "rd6281a"

diff --git a/board/Marvell/sheevaplug/Kconfig b/board/Marvell/sheevaplug/Kconfig
index 6f3eb38970f054f619933ae3fdebf25a9f1a891b..1c24d24221cd4091f85be19cfe23dc502ae60536 100644 (file)
--- a/board/Marvell/sheevaplug/Kconfig
+++ b/board/Marvell/sheevaplug/Kconfig
@@ -1,9 +1,5 @@
 if TARGET_SHEEVAPLUG
 
-config SYS_CPU
-       string
-       default "arm926ejs"
-
 config SYS_BOARD
        string
        default "sheevaplug"
@@ -12,10 +8,6 @@ config SYS_VENDOR
        string
        default "Marvell"
 
-config SYS_SOC
-       string
-       default "kirkwood"
-
 config SYS_CONFIG_NAME
        string
        default "sheevaplug"

diff --git a/board/Seagate/dockstar/Kconfig b/board/Seagate/dockstar/Kconfig
index 4696ac6d2eba5aa06996d29bba4f58cde9c163bc..13ea620ea6d9c21201cde4ccc594f58c9c9f6996 100644 (file)
--- a/board/Seagate/dockstar/Kconfig
+++ b/board/Seagate/dockstar/Kconfig
@@ -1,9 +1,5 @@
 if TARGET_DOCKSTAR
 
-config SYS_CPU
-       string
-       default "arm926ejs"
-
 config SYS_BOARD
        string
        default "dockstar"
@@ -12,10 +8,6 @@ config SYS_VENDOR
        string
        default "Seagate"
 
-config SYS_SOC
-       string
-       default "kirkwood"
-
 config SYS_CONFIG_NAME
        string
        default "dockstar"

diff --git a/board/Seagate/goflexhome/Kconfig b/board/Seagate/goflexhome/Kconfig
index 0f918cbfab44e548c517ec7e8f40bb9b6e3ef027..2fb14ef86f9f6b8e45109ae44850eb547ee6909b 100644 (file)
--- a/board/Seagate/goflexhome/Kconfig
+++ b/board/Seagate/goflexhome/Kconfig
@@ -1,9 +1,5 @@
 if TARGET_GOFLEXHOME
 
-config SYS_CPU
-       string
-       default "arm926ejs"
-
 config SYS_BOARD
        string
        default "goflexhome"
@@ -12,10 +8,6 @@ config SYS_VENDOR
        string
        default "Seagate"
 
-config SYS_SOC
-       string
-       default "kirkwood"
-
 config SYS_CONFIG_NAME
        string
        default "goflexhome"

diff --git a/board/buffalo/lsxl/Kconfig b/board/buffalo/lsxl/Kconfig
index 99f7b7ccebb20e1ff90aa72865d1f84a50dc55c6..50a620e821fec702741fcec671bb30b43487d58a 100644 (file)
--- a/board/buffalo/lsxl/Kconfig
+++ b/board/buffalo/lsxl/Kconfig
@@ -1,9 +1,5 @@
 if TARGET_LSXL
 
-config SYS_CPU
-       string
-       default "arm926ejs"
-
 config SYS_BOARD
        string
        default "lsxl"
@@ -12,10 +8,6 @@ config SYS_VENDOR
        string
        default "buffalo"
 
-config SYS_SOC
-       string
-       default "kirkwood"
-
 config SYS_CONFIG_NAME
        string
        default "lsxl"

diff --git a/board/cloudengines/pogo_e02/Kconfig b/board/cloudengines/pogo_e02/Kconfig
index 149a1a247db7dcbd972d0660d8bacdefdc6fbd43..fe36314f487152f8d11195984b670504aae3c4e4 100644 (file)
--- a/board/cloudengines/pogo_e02/Kconfig
+++ b/board/cloudengines/pogo_e02/Kconfig
@@ -1,9 +1,5 @@
 if TARGET_POGO_E02
 
-config SYS_CPU
-       string
-       default "arm926ejs"
-
 config SYS_BOARD
        string
        default "pogo_e02"
@@ -12,10 +8,6 @@ config SYS_VENDOR
        string
        default "cloudengines"
 
-config SYS_SOC
-       string
-       default "kirkwood"
-
 config SYS_CONFIG_NAME
        string
        default "pogo_e02"

diff --git a/board/d-link/dns325/Kconfig b/board/d-link/dns325/Kconfig
index dea6071f47eebd5d8333a021a0ce7c413259fb5c..763f93c2ce0d0b600a682dd7119a0bd410c8ceb5 100644 (file)
--- a/board/d-link/dns325/Kconfig
+++ b/board/d-link/dns325/Kconfig
@@ -1,9 +1,5 @@
 if TARGET_DNS325
 
-config SYS_CPU
-       string
-       default "arm926ejs"
-
 config SYS_BOARD
        string
        default "dns325"
@@ -12,10 +8,6 @@ config SYS_VENDOR
        string
        default "d-link"
 
-config SYS_SOC
-       string
-       default "kirkwood"
-
 config SYS_CONFIG_NAME
        string
        default "dns325"

diff --git a/board/iomega/iconnect/Kconfig b/board/iomega/iconnect/Kconfig
index 8ac21d29999aacfcb36a8531a2c18392c99d2fb0..f75c06b7a31c8eab770e38a51cdcec422844bb12 100644 (file)
--- a/board/iomega/iconnect/Kconfig
+++ b/board/iomega/iconnect/Kconfig
@@ -1,9 +1,5 @@
 if TARGET_ICONNECT
 
-config SYS_CPU
-       string
-       default "arm926ejs"
-
 config SYS_BOARD
        string
        default "iconnect"
@@ -12,10 +8,6 @@ config SYS_VENDOR
        string
        default "iomega"
 
-config SYS_SOC
-       string
-       default "kirkwood"
-
 config SYS_CONFIG_NAME
        string
        default "iconnect"

diff --git a/board/karo/tk71/Kconfig b/board/karo/tk71/Kconfig
index 546491b67d72a3b7a004c35d0fdb82c760f4cb57..24071f67e2b865e79ebf236c9d8130c8688f8828 100644 (file)
--- a/board/karo/tk71/Kconfig
+++ b/board/karo/tk71/Kconfig
@@ -1,9 +1,5 @@
 if TARGET_TK71
 
-config SYS_CPU
-       string
-       default "arm926ejs"
-
 config SYS_BOARD
        string
        default "tk71"
@@ -12,10 +8,6 @@ config SYS_VENDOR
        string
        default "karo"
 
-config SYS_SOC
-       string
-       default "kirkwood"
-
 config SYS_CONFIG_NAME
        string
        default "tk71"

diff --git a/board/keymile/km_arm/Kconfig b/board/keymile/km_arm/Kconfig
index dec46268c619fedbf027feb238651c7caa0cdbbe..3e9cddb54b2f90b7b5ffe7539cb3d72d84ab7a14 100644 (file)
--- a/board/keymile/km_arm/Kconfig
+++ b/board/keymile/km_arm/Kconfig
@@ -1,9 +1,5 @@
 if TARGET_KM_KIRKWOOD
 
-config SYS_CPU
-       string
-       default "arm926ejs"
-
 config SYS_BOARD
        string
        default "km_arm"
@@ -12,10 +8,6 @@ config SYS_VENDOR
        string
        default "keymile"
 
-config SYS_SOC
-       string
-       default "kirkwood"
-
 config SYS_CONFIG_NAME
        string
        default "km_kirkwood"

diff --git a/board/raidsonic/ib62x0/Kconfig b/board/raidsonic/ib62x0/Kconfig
index 1e667c47feb232fa473df9292cbffabb1ac2f95e..c0c3a93b0219b972286f5e6e0f14d916d6306b29 100644 (file)
--- a/board/raidsonic/ib62x0/Kconfig
+++ b/board/raidsonic/ib62x0/Kconfig
@@ -1,9 +1,5 @@
 if TARGET_IB62X0
 
-config SYS_CPU
-       string
-       default "arm926ejs"
-
 config SYS_BOARD
        string
        default "ib62x0"
@@ -12,10 +8,6 @@ config SYS_VENDOR
        string
        default "raidsonic"
 
-config SYS_SOC
-       string
-       default "kirkwood"
-
 config SYS_CONFIG_NAME
        string
        default "ib62x0"

diff --git a/configs/d2net_v2_defconfig b/configs/d2net_v2_defconfig
index e53aed780d388ab7d06c6a6a4401b893cb2cbb4a..c459f4de234ae062d000699bf3815679f536f643 100644 (file)
--- a/configs/d2net_v2_defconfig
+++ b/configs/d2net_v2_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="D2NET_V2"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_NET2BIG_V2=y

diff --git a/configs/dns325_defconfig b/configs/dns325_defconfig
index 6a18d2a0e7eb910aa32b631f5158953c45a9aaf5..cc4a03b1172649f5df21dd201f34cfdd1995c506 100644 (file)
--- a/configs/dns325_defconfig
+++ b/configs/dns325_defconfig
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_DNS325=y

diff --git a/configs/dockstar_defconfig b/configs/dockstar_defconfig
index 528669eb4f1211a09d93070b446fa89f55f81502..b773cdeff4e59752c73969c9e8349b2c05570dbe 100644 (file)
--- a/configs/dockstar_defconfig
+++ b/configs/dockstar_defconfig
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_DOCKSTAR=y

diff --git a/configs/dreamplug_defconfig b/configs/dreamplug_defconfig
index 49de2107371231104eb9750618b7e23d1467a379..45113c881f601468e2ce507a009850b6e68e8fc0 100644 (file)
--- a/configs/dreamplug_defconfig
+++ b/configs/dreamplug_defconfig
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_DREAMPLUG=y

diff --git a/configs/goflexhome_defconfig b/configs/goflexhome_defconfig
index 10fde535cb96d510e84970d4f7e32405ee37bce5..276489bbae68ce69cbf48ec3d4af820ffde0c7a8 100644 (file)
--- a/configs/goflexhome_defconfig
+++ b/configs/goflexhome_defconfig
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_GOFLEXHOME=y

diff --git a/configs/guruplug_defconfig b/configs/guruplug_defconfig
index f5be577735f3bd892d7b99f5483ba1036465a3ff..912a0896a4eea5a46bdfb9ed2f94cf71100db49e 100644 (file)
--- a/configs/guruplug_defconfig
+++ b/configs/guruplug_defconfig
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_GURUPLUG=y

diff --git a/configs/ib62x0_defconfig b/configs/ib62x0_defconfig
index d92217edf6343bc4c607df2c0d445a1ecda9e395..b6780c54da89d968c995a938858ded9c2efbc6ec 100644 (file)
--- a/configs/ib62x0_defconfig
+++ b/configs/ib62x0_defconfig
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_IB62X0=y

diff --git a/configs/iconnect_defconfig b/configs/iconnect_defconfig
index ab83fa6a52272f0bdac74f3e331f42a24894ab49..7ff8d673d8f791c989f4a79430cfe428dec0b91b 100644 (file)
--- a/configs/iconnect_defconfig
+++ b/configs/iconnect_defconfig
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_ICONNECT=y

diff --git a/configs/inetspace_v2_defconfig b/configs/inetspace_v2_defconfig
index 26d993216e96ba4008a189c5ea1fee27caddbb4f..1123b524d4de195f4f4606d784e24827af83e2c6 100644 (file)
--- a/configs/inetspace_v2_defconfig
+++ b/configs/inetspace_v2_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="INETSPACE_V2"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_NETSPACE_V2=y

diff --git a/configs/km_kirkwood_128m16_defconfig b/configs/km_kirkwood_128m16_defconfig
index c51fbf312893ff36b543f805dbda1fb70bf41715..6a263a6ad4e50e9d07d50ba8ed0aac11daf61a17 100644 (file)
--- a/configs/km_kirkwood_128m16_defconfig
+++ b/configs/km_kirkwood_128m16_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD_128M16"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y

diff --git a/configs/km_kirkwood_defconfig b/configs/km_kirkwood_defconfig
index 4f554f79f712e21e428fc52ef13d8850720edd44..aff76e50a5765c3f45241be6c32b8d41d335bf73 100644 (file)
--- a/configs/km_kirkwood_defconfig
+++ b/configs/km_kirkwood_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y

diff --git a/configs/km_kirkwood_pci_defconfig b/configs/km_kirkwood_pci_defconfig
index abb42c90b8e360a75317dfcf9b749b65854e65a6..13c70a796cf8748a34fb6f1fce291a1a03ca7019 100644 (file)
--- a/configs/km_kirkwood_pci_defconfig
+++ b/configs/km_kirkwood_pci_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD_PCI"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y

diff --git a/configs/kmcoge5un_defconfig b/configs/kmcoge5un_defconfig
index 037827772fc57a64d9f178036bde9cc3301491c7..78057e495abf315a5b7a63f3d1f51b73a91ae695 100644 (file)
--- a/configs/kmcoge5un_defconfig
+++ b/configs/kmcoge5un_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="KM_COGE5UN"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y

diff --git a/configs/kmnusa_defconfig b/configs/kmnusa_defconfig
index 46ddbcd7cbf15472aabec6aa29021e1fd66ce9a2..d125c52d40df0b8c54e7a0ebd86900ad49eaf3d6 100644 (file)
--- a/configs/kmnusa_defconfig
+++ b/configs/kmnusa_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="KM_NUSA"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y

diff --git a/configs/kmsugp1_defconfig b/configs/kmsugp1_defconfig
index 183b36505c90165c2ad4094e8302451ec5641b8c..d40dfd938ff182b921c38abd06a1872298981ed1 100644 (file)
--- a/configs/kmsugp1_defconfig
+++ b/configs/kmsugp1_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="KM_SUGP1"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y

diff --git a/configs/kmsuv31_defconfig b/configs/kmsuv31_defconfig
index 9434ef0e1b6c6090b29038d723f1c7f7e808590a..40d09935ac4438879626d34c682a20d40288ace2 100644 (file)
--- a/configs/kmsuv31_defconfig
+++ b/configs/kmsuv31_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="KM_SUV31"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y

diff --git a/configs/lschlv2_defconfig b/configs/lschlv2_defconfig
index 330b4d7d947700f90895a0a0047ea7ed3225450e..8c02fb3e4f7c25cb080c39abd644a7b24e64bc2b 100644 (file)
--- a/configs/lschlv2_defconfig
+++ b/configs/lschlv2_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="LSCHLV2"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_LSXL=y

diff --git a/configs/lsxhl_defconfig b/configs/lsxhl_defconfig
index e8cdf8ac69c7f21846c6dfa98dbef2cb2870aa62..86845d1904b32078f409d8ed327ea31879f1cbea 100644 (file)
--- a/configs/lsxhl_defconfig
+++ b/configs/lsxhl_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="LSXHL"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_LSXL=y

diff --git a/configs/mgcoge3un_defconfig b/configs/mgcoge3un_defconfig
index bc1e2ba58e5cd30738b42f1f2f271f948316735b..da991aad6a379e1c1ac58112d58a4e63ffe7fe8e 100644 (file)
--- a/configs/mgcoge3un_defconfig
+++ b/configs/mgcoge3un_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="KM_MGCOGE3UN"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y

diff --git a/configs/mv88f6281gtw_ge_defconfig b/configs/mv88f6281gtw_ge_defconfig
index 4e268792b07fd2dd840df1d39a59b69738df43cc..0650032f20857be1ec4ef8fb6385eefa9677a3e8 100644 (file)
--- a/configs/mv88f6281gtw_ge_defconfig
+++ b/configs/mv88f6281gtw_ge_defconfig
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_MV88F6281GTW_GE=y

diff --git a/configs/net2big_v2_defconfig b/configs/net2big_v2_defconfig
index bffea6057257791dd2dc43b90690ff3ba8ad0e60..7422fbedcfbcfef13778e2b6a06b1a5e716c52c3 100644 (file)
--- a/configs/net2big_v2_defconfig
+++ b/configs/net2big_v2_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="NET2BIG_V2"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_NET2BIG_V2=y

diff --git a/configs/netspace_lite_v2_defconfig b/configs/netspace_lite_v2_defconfig
index b2621529e659c9fc1ca8ae51aa31a604f7eac7bf..6a3a32f8aa07385e481ab1d1b971de97caff485c 100644 (file)
--- a/configs/netspace_lite_v2_defconfig
+++ b/configs/netspace_lite_v2_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_LITE_V2"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_NETSPACE_V2=y

diff --git a/configs/netspace_max_v2_defconfig b/configs/netspace_max_v2_defconfig
index 4fc84fc56e21b1ef781f7b8e3a04c40c2c6cfb02..903d6c98476240b60d89843d936c4b7d378387d3 100644 (file)
--- a/configs/netspace_max_v2_defconfig
+++ b/configs/netspace_max_v2_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_MAX_V2"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_NETSPACE_V2=y

diff --git a/configs/netspace_mini_v2_defconfig b/configs/netspace_mini_v2_defconfig
index 631a31bf0c1ba2144ca664d566670af24bdf7cf7..774faa74bcc99f5b6b4169e7bb2901703eeccdf6 100644 (file)
--- a/configs/netspace_mini_v2_defconfig
+++ b/configs/netspace_mini_v2_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_MINI_V2"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_NETSPACE_V2=y

diff --git a/configs/netspace_v2_defconfig b/configs/netspace_v2_defconfig
index dd77bfef1e0186c45fa5f224154f714e67e66494..776fc04916eb65be603bd6faf4f7c82fcd1ba40e 100644 (file)
--- a/configs/netspace_v2_defconfig
+++ b/configs/netspace_v2_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_V2"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_NETSPACE_V2=y

diff --git a/configs/openrd_base_defconfig b/configs/openrd_base_defconfig
index 25f777ee5daecd978fab6151cf8146932eddb708..7b3ea99a21b1e5e738b4049f6533acb6079135b9 100644 (file)
--- a/configs/openrd_base_defconfig
+++ b/configs/openrd_base_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_BASE"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_OPENRD=y

diff --git a/configs/openrd_client_defconfig b/configs/openrd_client_defconfig
index ba71851d366c9ca993605c54a6be7e7caf27fb9c..d34793dd8a260510d97535835c97543bd7b644fa 100644 (file)
--- a/configs/openrd_client_defconfig
+++ b/configs/openrd_client_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_CLIENT"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_OPENRD=y

diff --git a/configs/openrd_ultimate_defconfig b/configs/openrd_ultimate_defconfig
index 8651f929bf7e62fd4e0688011cb20bdc32cfa0e6..4e10d4d1d6eef43dcf2624b634d2cd59925a86f5 100644 (file)
--- a/configs/openrd_ultimate_defconfig
+++ b/configs/openrd_ultimate_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_ULTIMATE"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_OPENRD=y

diff --git a/configs/pogo_e02_defconfig b/configs/pogo_e02_defconfig
index 41637e06b8e8a69e457f9aa80d0d5f3fc0000a0d..97effefa313677635eff07e6cba7f1cfdc761c27 100644 (file)
--- a/configs/pogo_e02_defconfig
+++ b/configs/pogo_e02_defconfig
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_POGO_E02=y

diff --git a/configs/portl2_defconfig b/configs/portl2_defconfig
index 6df18e9c0006e6aa27e7c8603cd20eb4dc981c4c..1895c80bb4994b4c92069560a54c6d020f1022a3 100644 (file)
--- a/configs/portl2_defconfig
+++ b/configs/portl2_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="KM_PORTL2"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y

diff --git a/configs/rd6281a_defconfig b/configs/rd6281a_defconfig
index d9c3e3984480cb6826abaa38e6083be6e455e1a5..ed083bf069809b4a7c5ee3471997eb1fd75c589f 100644 (file)
--- a/configs/rd6281a_defconfig
+++ b/configs/rd6281a_defconfig
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_RD6281A=y

diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig
index 9e4b9c91fa87489581399199f80df169b5d2f5a1..d22b00674ff30c5f6e600fefa2106ca4cfa9882e 100644 (file)
--- a/configs/sheevaplug_defconfig
+++ b/configs/sheevaplug_defconfig
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_SHEEVAPLUG=y

diff --git a/configs/tk71_defconfig b/configs/tk71_defconfig
index ffff874816468807a5628169503991a74db583bf..411e3c1f97b3a2a5fe55fb55255cb98ac329d8de 100644 (file)
--- a/configs/tk71_defconfig
+++ b/configs/tk71_defconfig
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_TK71=y

diff --git a/configs/wireless_space_defconfig b/configs/wireless_space_defconfig
index 6c785485170d061c7d9d79b5c921f31334d83ef3..580e5ce61fba4d50be0b670f95cba3a9be9c9f95 100644 (file)
--- a/configs/wireless_space_defconfig
+++ b/configs/wireless_space_defconfig
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_WIRELESS_SPACE=y

diff --git a/include/configs/dns325.h b/include/configs/dns325.h
index 96db44f5189074824d620606ac94d36085aa758f..eaf8c855818823e67321785c8cd50e94476220e6 100644 (file)
--- a/include/configs/dns325.h
+++ b/include/configs/dns325.h
@@ -24,7 +24,6 @@
  * High Level Configuration Options (easy to change)
  */
 #define CONFIG_FEROCEON_88FR131                /* CPU Core subversion */
-#define CONFIG_KIRKWOOD                        /* SOC Family Name */
 #define CONFIG_KW88F6281               /* SOC Name */
 #define CONFIG_SKIP_LOWLEVEL_INIT      /* disable board lowlevel_init */
 

diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h
index d66bd2ab3475612930ad7a7f4c145c7736f9818b..46a42b30874492f970aabf6b0420ea11d57d7dbc 100644 (file)
--- a/include/configs/dockstar.h
+++ b/include/configs/dockstar.h
@@ -21,7 +21,6 @@
  * High Level Configuration Options (easy to change)
  */
 #define CONFIG_FEROCEON_88FR131        1       /* CPU Core subversion */
-#define CONFIG_KIRKWOOD                1       /* SOC Family Name */
 #define CONFIG_KW88F6281       1       /* SOC Name */
 #define CONFIG_MACH_DOCKSTAR   /* Machine type */
 #define CONFIG_SKIP_LOWLEVEL_INIT      /* disable board lowlevel_init */

diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h
index b1ca8592507b0e248f4336dfb8b6d3df697f215c..981233a0709625acd379c49abcdd3704fd137bbe 100644 (file)
--- a/include/configs/dreamplug.h
+++ b/include/configs/dreamplug.h
@@ -34,7 +34,6 @@
  * High Level Configuration Options (easy to change)
  */
 #define CONFIG_SHEEVA_88SV131  1       /* CPU Core subversion */
-#define CONFIG_KIRKWOOD                1       /* SOC Family Name */
 #define CONFIG_KW88F6281       1       /* SOC Name */
 #define CONFIG_MACH_TYPE       MACH_TYPE_DREAMPLUG
 #define CONFIG_SKIP_LOWLEVEL_INIT      /* disable board lowlevel_init */

diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h
index 30a5859c55f7203622b10768d7a1aa22b77e4f8c..5ed949791f642a5e0a901d7838c0f2595e7fecd1 100644 (file)
--- a/include/configs/goflexhome.h
+++ b/include/configs/goflexhome.h
@@ -24,7 +24,6 @@
  * High Level Configuration Options (easy to change)
  */
 #define CONFIG_FEROCEON_88FR131        1       /* CPU Core subversion */
-#define CONFIG_KIRKWOOD                1       /* SOC Family Name */
 #define CONFIG_KW88F6281       1       /* SOC Name */
 #define CONFIG_MACH_GOFLEXHOME         /* Machine type */
 #define CONFIG_SKIP_LOWLEVEL_INIT      /* disable board lowlevel_init */

diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h
index e401e7e9b8064f920499bf4142d94a9aa569f4f5..a56a4cb98271c558bcd4a3654b686c448ebdd06c 100644 (file)
--- a/include/configs/guruplug.h
+++ b/include/configs/guruplug.h
@@ -18,7 +18,6 @@
  * High Level Configuration Options (easy to change)
  */
 #define CONFIG_SHEEVA_88SV131  1       /* CPU Core subversion */
-#define CONFIG_KIRKWOOD                1       /* SOC Family Name */
 #define CONFIG_KW88F6281       1       /* SOC Name */
 #define CONFIG_MACH_GURUPLUG   /* Machine type */
 #define CONFIG_SKIP_LOWLEVEL_INIT      /* disable board lowlevel_init */

diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h
index 186fd35fdbcba8b62b0fc82b7598d7b6a5008335..f4c748a91d1f0d94190046545fcf73fd5b9946d5 100644 (file)
--- a/include/configs/ib62x0.h
+++ b/include/configs/ib62x0.h
@@ -18,7 +18,6 @@
  * High level configuration options
  */
 #define CONFIG_FEROCEON_88FR131                /* CPU Core subversion */
-#define CONFIG_KIRKWOOD                        /* SOC Family Name */
 #define CONFIG_KW88F6281               /* SOC Name */
 #define CONFIG_SKIP_LOWLEVEL_INIT      /* disable board lowlevel_init */
 

diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h
index a58f076c21c87df3032344c0c2fbb6c5bf62c877..9f4a4b83a32a7927f6a4f6b2ac168b30a614cb97 100644 (file)
--- a/include/configs/iconnect.h
+++ b/include/configs/iconnect.h
@@ -18,7 +18,6 @@
  * High level configuration options
  */
 #define CONFIG_FEROCEON_88FR131                /* CPU Core subversion */
-#define CONFIG_KIRKWOOD                        /* SOC Family Name */
 #define CONFIG_KW88F6281               /* SOC Name */
 #define CONFIG_SKIP_LOWLEVEL_INIT      /* disable board lowlevel_init */
 

diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h
index 6d77680c82a5a3e1cb48e80f0f18357cac2a4ed7..d31e674eacb1ee0fe58db2caae3fc0456319ec66 100644 (file)
--- a/include/configs/km/km_arm.h
+++ b/include/configs/km/km_arm.h
@@ -28,7 +28,6 @@
  */
 #define CONFIG_MARVELL
 #define CONFIG_FEROCEON_88FR131                /* CPU Core subversion */
-#define CONFIG_KIRKWOOD                        /* SOC Family Name */
 #define CONFIG_KW88F6281               /* SOC Name */
 #define CONFIG_MACH_KM_KIRKWOOD                /* Machine type */
 

diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h
index 2d2e23a2a9c65f1125ab6a8f84e96b2be0cf35e2..9ac5d3319edaee89229902e9f9544ec61c595208 100644 (file)
--- a/include/configs/lacie_kw.h
+++ b/include/configs/lacie_kw.h
@@ -41,7 +41,6 @@
  * High Level Configuration Options (easy to change)
  */
 #define CONFIG_FEROCEON_88FR131                /* CPU Core subversion */
-#define CONFIG_KIRKWOOD                        /* SoC Family Name */
 /* SoC name */
 #if defined(CONFIG_NETSPACE_LITE_V2) || defined(CONFIG_NETSPACE_MINI_V2)
 #define CONFIG_KW88F6192

diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h
index f5f49613c89365fc6c35a55db8fa3cb1d858099f..bf5c1a1298285ce47dfc6a34c9a5745a31b68e41 100644 (file)
--- a/include/configs/lsxl.h
+++ b/include/configs/lsxl.h
@@ -29,7 +29,6 @@
  * General configuration options
  */
 #define CONFIG_FEROCEON_88FR131                /* CPU Core subversion */
-#define CONFIG_KIRKWOOD                        /* SOC Family Name */
 #define CONFIG_KW88F6281               /* SOC Name */
 
 #define CONFIG_SKIP_LOWLEVEL_INIT      /* disable board lowlevel_init */

diff --git a/include/configs/mv88f6281gtw_ge.h b/include/configs/mv88f6281gtw_ge.h
index f6c06eea25a4b7259cfbc83ddc8d6c628695286c..311fc0c3c54fdde3ced2048cab677b03d14a89bf 100644 (file)
--- a/include/configs/mv88f6281gtw_ge.h
+++ b/include/configs/mv88f6281gtw_ge.h
@@ -18,7 +18,6 @@
  * High Level Configuration Options (easy to change)
  */
 #define CONFIG_FEROCEON_88FR131        1       /* CPU Core subversion */
-#define CONFIG_KIRKWOOD                1       /* SOC Family Name */
 #define CONFIG_KW88F6281       1       /* SOC Name */
 #define CONFIG_MACH_MV88F6281GTW_GE    /* Machine type */
 #define CONFIG_SKIP_LOWLEVEL_INIT      /* disable board lowlevel_init */

diff --git a/include/configs/openrd.h b/include/configs/openrd.h
index b65bdfda32870b17547b3e1101d30e540d4199ec..b6f80af801ffe349680968dd02c03702ee1b3e04 100644 (file)
--- a/include/configs/openrd.h
+++ b/include/configs/openrd.h
@@ -35,7 +35,6 @@
  * High Level Configuration Options (easy to change)
  */
 #define CONFIG_SHEEVA_88SV131  1       /* CPU Core subversion */
-#define CONFIG_KIRKWOOD                1       /* SOC Family Name */
 #define CONFIG_KW88F6281       1       /* SOC Name */
 #define CONFIG_MACH_OPENRD_BASE        /* Machine type */
 #define CONFIG_SKIP_LOWLEVEL_INIT      /* disable board lowlevel_init */

diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h
index a81d452194d5ee1e8fb77f8b99c8a66143ab5215..7594bdb4123a514c8704e829c2ec21090ec17456 100644 (file)
--- a/include/configs/pogo_e02.h
+++ b/include/configs/pogo_e02.h
@@ -24,7 +24,6 @@
  * High Level Configuration Options (easy to change)
  */
 #define CONFIG_FEROCEON_88FR131                /* CPU Core subversion */
-#define CONFIG_KIRKWOOD                        /* SOC Family Name */
 #define CONFIG_KW88F6281               /* SOC Name */
 #define CONFIG_SKIP_LOWLEVEL_INIT      /* disable board lowlevel_init */
 

diff --git a/include/configs/rd6281a.h b/include/configs/rd6281a.h
index 9856516c1a226db0ee97cdc6554751affb455634..e80949e3d61ca57b7f210f209b7487f47e5ae4e0 100644 (file)
--- a/include/configs/rd6281a.h
+++ b/include/configs/rd6281a.h
@@ -18,7 +18,6 @@
  * High Level Configuration Options (easy to change)
  */
 #define CONFIG_FEROCEON_88FR131        1       /* CPU Core subversion */
-#define CONFIG_KIRKWOOD                1       /* SOC Family Name */
 #define CONFIG_KW88F6281       1       /* SOC Name */
 #define CONFIG_MACH_RD6281A            /* Machine type */
 #define CONFIG_SKIP_LOWLEVEL_INIT      /* disable board lowlevel_init */

diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h
index 3d6ff09cb019373bf0dcfa303ad1d3fc747a5721..4747adfeb0d57e07c7c8cc6a63166e98f12d739b 100644 (file)
--- a/include/configs/sheevaplug.h
+++ b/include/configs/sheevaplug.h
@@ -18,7 +18,6 @@
  * High Level Configuration Options (easy to change)
  */
 #define CONFIG_FEROCEON_88FR131        1       /* CPU Core subversion */
-#define CONFIG_KIRKWOOD                1       /* SOC Family Name */
 #define CONFIG_KW88F6281       1       /* SOC Name */
 #define CONFIG_MACH_SHEEVAPLUG /* Machine type */
 #define CONFIG_SKIP_LOWLEVEL_INIT      /* disable board lowlevel_init */

diff --git a/include/configs/tk71.h b/include/configs/tk71.h
index 16e8a7f2b8be51212062d27ecf011b82eb62839a..a9c6d2e601cd61c4a346e83da37fc0987c05b446 100644 (file)
--- a/include/configs/tk71.h
+++ b/include/configs/tk71.h
@@ -17,7 +17,6 @@
  * High Level Configuration Options (easy to change)
  */
 #define CONFIG_FEROCEON_88FR131        1       /* CPU Core subversion */
-#define CONFIG_KIRKWOOD                1       /* SOC Family Name */
 #define CONFIG_KW88F6281       1       /* SOC Name */
 #define CONFIG_SKIP_LOWLEVEL_INIT      /* disable board lowlevel_init */
 #define CONFIG_NR_DRAM_BANKS   1

diff --git a/include/configs/wireless_space.h b/include/configs/wireless_space.h
index 2070a9b1bdc059c1d7a0d729994d0e4d257d3585..036c1e427e6e498e856ebee44bef841814cecaa2 100644 (file)
--- a/include/configs/wireless_space.h
+++ b/include/configs/wireless_space.h
@@ -21,7 +21,6 @@
  * High Level Configuration Options (easy to change)
  */
 #define CONFIG_FEROCEON_88FR131                /* CPU Core subversion */
-#define CONFIG_KIRKWOOD                        /* SoC Family Name */
 /* SoC name */
 #define CONFIG_KW88F6281
 #define CONFIG_SKIP_LOWLEVEL_INIT      /* disable board lowlevel_init */