From 47539e2317276ab7e31b47f75e52981c4473dbbd Mon Sep 17 00:00:00 2001 From: Masahiro Yamada <yamada.m@jp.panasonic.com> Date: Sun, 31 Aug 2014 07:10:59 +0900 Subject: [PATCH] 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> --- arch/arm/Kconfig | 75 ++------------------- arch/arm/cpu/arm926ejs/kirkwood/Kconfig | 89 +++++++++++++++++++++++++ board/LaCie/net2big_v2/Kconfig | 8 --- board/LaCie/netspace_v2/Kconfig | 8 --- board/LaCie/wireless_space/Kconfig | 8 --- board/Marvell/dreamplug/Kconfig | 8 --- board/Marvell/guruplug/Kconfig | 8 --- board/Marvell/mv88f6281gtw_ge/Kconfig | 8 --- board/Marvell/openrd/Kconfig | 8 --- board/Marvell/rd6281a/Kconfig | 8 --- board/Marvell/sheevaplug/Kconfig | 8 --- board/Seagate/dockstar/Kconfig | 8 --- board/Seagate/goflexhome/Kconfig | 8 --- board/buffalo/lsxl/Kconfig | 8 --- board/cloudengines/pogo_e02/Kconfig | 8 --- board/d-link/dns325/Kconfig | 8 --- board/iomega/iconnect/Kconfig | 8 --- board/karo/tk71/Kconfig | 8 --- board/keymile/km_arm/Kconfig | 8 --- board/raidsonic/ib62x0/Kconfig | 8 --- configs/d2net_v2_defconfig | 1 + configs/dns325_defconfig | 1 + configs/dockstar_defconfig | 1 + configs/dreamplug_defconfig | 1 + configs/goflexhome_defconfig | 1 + configs/guruplug_defconfig | 1 + configs/ib62x0_defconfig | 1 + configs/iconnect_defconfig | 1 + configs/inetspace_v2_defconfig | 1 + configs/km_kirkwood_128m16_defconfig | 1 + configs/km_kirkwood_defconfig | 1 + configs/km_kirkwood_pci_defconfig | 1 + configs/kmcoge5un_defconfig | 1 + configs/kmnusa_defconfig | 1 + configs/kmsugp1_defconfig | 1 + configs/kmsuv31_defconfig | 1 + configs/lschlv2_defconfig | 1 + configs/lsxhl_defconfig | 1 + configs/mgcoge3un_defconfig | 1 + configs/mv88f6281gtw_ge_defconfig | 1 + configs/net2big_v2_defconfig | 1 + configs/netspace_lite_v2_defconfig | 1 + configs/netspace_max_v2_defconfig | 1 + configs/netspace_mini_v2_defconfig | 1 + configs/netspace_v2_defconfig | 1 + configs/openrd_base_defconfig | 1 + configs/openrd_client_defconfig | 1 + configs/openrd_ultimate_defconfig | 1 + configs/pogo_e02_defconfig | 1 + configs/portl2_defconfig | 1 + configs/rd6281a_defconfig | 1 + configs/sheevaplug_defconfig | 1 + configs/tk71_defconfig | 1 + configs/wireless_space_defconfig | 1 + include/configs/dns325.h | 1 - include/configs/dockstar.h | 1 - include/configs/dreamplug.h | 1 - include/configs/goflexhome.h | 1 - include/configs/guruplug.h | 1 - include/configs/ib62x0.h | 1 - include/configs/iconnect.h | 1 - include/configs/km/km_arm.h | 1 - include/configs/lacie_kw.h | 1 - include/configs/lsxl.h | 1 - include/configs/mv88f6281gtw_ge.h | 1 - include/configs/openrd.h | 1 - include/configs/pogo_e02.h | 1 - include/configs/rd6281a.h | 1 - include/configs/sheevaplug.h | 1 - include/configs/tk71.h | 1 - include/configs/wireless_space.h | 1 - 71 files changed, 127 insertions(+), 232 deletions(-) create mode 100644 arch/arm/cpu/arm926ejs/kirkwood/Kconfig diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 4e9e26fbc3..8c5d43d803 100644 --- 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 index 0000000000..58867f3cf1 --- /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 867d0d3842..e8eb9ad5bc 100644 --- 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 fb6fbef92c..6242a42389 100644 --- 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 4815cdeed3..ea6850f477 100644 --- 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 e067318163..afaddf4a81 100644 --- 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 fce8562187..0b10e9f774 100644 --- 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 17adab09e9..49654fe769 100644 --- 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 2dfed34dc8..7032ba57ce 100644 --- 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 ae753b036b..e8702a7d19 100644 --- 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 6f3eb38970..1c24d24221 100644 --- 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 4696ac6d2e..13ea620ea6 100644 --- 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 0f918cbfab..2fb14ef86f 100644 --- 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 99f7b7cceb..50a620e821 100644 --- 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 149a1a247d..fe36314f48 100644 --- 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 dea6071f47..763f93c2ce 100644 --- 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 8ac21d2999..f75c06b7a3 100644 --- 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 546491b67d..24071f67e2 100644 --- 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 dec46268c6..3e9cddb54b 100644 --- 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 1e667c47fe..c0c3a93b02 100644 --- 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 e53aed780d..c459f4de23 100644 --- 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 6a18d2a0e7..cc4a03b117 100644 --- 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 528669eb4f..b773cdeff4 100644 --- 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 49de210737..45113c881f 100644 --- 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 10fde535cb..276489bbae 100644 --- 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 f5be577735..912a0896a4 100644 --- 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 d92217edf6..b6780c54da 100644 --- 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 ab83fa6a52..7ff8d673d8 100644 --- 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 26d993216e..1123b524d4 100644 --- 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 c51fbf3128..6a263a6ad4 100644 --- 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 4f554f79f7..aff76e50a5 100644 --- 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 abb42c90b8..13c70a796c 100644 --- 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 037827772f..78057e495a 100644 --- 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 46ddbcd7cb..d125c52d40 100644 --- 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 183b36505c..d40dfd938f 100644 --- 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 9434ef0e1b..40d09935ac 100644 --- 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 330b4d7d94..8c02fb3e4f 100644 --- 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 e8cdf8ac69..86845d1904 100644 --- 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 bc1e2ba58e..da991aad6a 100644 --- 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 4e268792b0..0650032f20 100644 --- 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 bffea60572..7422fbedcf 100644 --- 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 b2621529e6..6a3a32f8aa 100644 --- 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 4fc84fc56e..903d6c9847 100644 --- 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 631a31bf0c..774faa74bc 100644 --- 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 dd77bfef1e..776fc04916 100644 --- 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 25f777ee5d..7b3ea99a21 100644 --- 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 ba71851d36..d34793dd8a 100644 --- 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 8651f929bf..4e10d4d1d6 100644 --- 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 41637e06b8..97effefa31 100644 --- 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 6df18e9c00..1895c80bb4 100644 --- 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 d9c3e39844..ed083bf069 100644 --- 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 9e4b9c91fa..d22b00674f 100644 --- 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 ffff874816..411e3c1f97 100644 --- 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 6c78548517..580e5ce61f 100644 --- 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 96db44f518..eaf8c85581 100644 --- 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 d66bd2ab34..46a42b3087 100644 --- 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 b1ca859250..981233a070 100644 --- 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 30a5859c55..5ed949791f 100644 --- 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 e401e7e9b8..a56a4cb982 100644 --- 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 186fd35fdb..f4c748a91d 100644 --- 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 a58f076c21..9f4a4b83a3 100644 --- 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 6d77680c82..d31e674eac 100644 --- 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 2d2e23a2a9..9ac5d3319e 100644 --- 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 f5f49613c8..bf5c1a1298 100644 --- 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 f6c06eea25..311fc0c3c5 100644 --- 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 b65bdfda32..b6f80af801 100644 --- 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 a81d452194..7594bdb412 100644 --- 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 9856516c1a..e80949e3d6 100644 --- 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 3d6ff09cb0..4747adfeb0 100644 --- 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 16e8a7f2b8..a9c6d2e601 100644 --- 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 2070a9b1bd..036c1e427e 100644 --- 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 */ -- 2.39.5