Ver código fonte

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>
Masahiro Yamada 10 anos atrás
pai
commit
47539e2317
71 arquivos alterados com 127 adições e 232 exclusões
  1. 4 71
      arch/arm/Kconfig
  2. 89 0
      arch/arm/cpu/arm926ejs/kirkwood/Kconfig
  3. 0 8
      board/LaCie/net2big_v2/Kconfig
  4. 0 8
      board/LaCie/netspace_v2/Kconfig
  5. 0 8
      board/LaCie/wireless_space/Kconfig
  6. 0 8
      board/Marvell/dreamplug/Kconfig
  7. 0 8
      board/Marvell/guruplug/Kconfig
  8. 0 8
      board/Marvell/mv88f6281gtw_ge/Kconfig
  9. 0 8
      board/Marvell/openrd/Kconfig
  10. 0 8
      board/Marvell/rd6281a/Kconfig
  11. 0 8
      board/Marvell/sheevaplug/Kconfig
  12. 0 8
      board/Seagate/dockstar/Kconfig
  13. 0 8
      board/Seagate/goflexhome/Kconfig
  14. 0 8
      board/buffalo/lsxl/Kconfig
  15. 0 8
      board/cloudengines/pogo_e02/Kconfig
  16. 0 8
      board/d-link/dns325/Kconfig
  17. 0 8
      board/iomega/iconnect/Kconfig
  18. 0 8
      board/karo/tk71/Kconfig
  19. 0 8
      board/keymile/km_arm/Kconfig
  20. 0 8
      board/raidsonic/ib62x0/Kconfig
  21. 1 0
      configs/d2net_v2_defconfig
  22. 1 0
      configs/dns325_defconfig
  23. 1 0
      configs/dockstar_defconfig
  24. 1 0
      configs/dreamplug_defconfig
  25. 1 0
      configs/goflexhome_defconfig
  26. 1 0
      configs/guruplug_defconfig
  27. 1 0
      configs/ib62x0_defconfig
  28. 1 0
      configs/iconnect_defconfig
  29. 1 0
      configs/inetspace_v2_defconfig
  30. 1 0
      configs/km_kirkwood_128m16_defconfig
  31. 1 0
      configs/km_kirkwood_defconfig
  32. 1 0
      configs/km_kirkwood_pci_defconfig
  33. 1 0
      configs/kmcoge5un_defconfig
  34. 1 0
      configs/kmnusa_defconfig
  35. 1 0
      configs/kmsugp1_defconfig
  36. 1 0
      configs/kmsuv31_defconfig
  37. 1 0
      configs/lschlv2_defconfig
  38. 1 0
      configs/lsxhl_defconfig
  39. 1 0
      configs/mgcoge3un_defconfig
  40. 1 0
      configs/mv88f6281gtw_ge_defconfig
  41. 1 0
      configs/net2big_v2_defconfig
  42. 1 0
      configs/netspace_lite_v2_defconfig
  43. 1 0
      configs/netspace_max_v2_defconfig
  44. 1 0
      configs/netspace_mini_v2_defconfig
  45. 1 0
      configs/netspace_v2_defconfig
  46. 1 0
      configs/openrd_base_defconfig
  47. 1 0
      configs/openrd_client_defconfig
  48. 1 0
      configs/openrd_ultimate_defconfig
  49. 1 0
      configs/pogo_e02_defconfig
  50. 1 0
      configs/portl2_defconfig
  51. 1 0
      configs/rd6281a_defconfig
  52. 1 0
      configs/sheevaplug_defconfig
  53. 1 0
      configs/tk71_defconfig
  54. 1 0
      configs/wireless_space_defconfig
  55. 0 1
      include/configs/dns325.h
  56. 0 1
      include/configs/dockstar.h
  57. 0 1
      include/configs/dreamplug.h
  58. 0 1
      include/configs/goflexhome.h
  59. 0 1
      include/configs/guruplug.h
  60. 0 1
      include/configs/ib62x0.h
  61. 0 1
      include/configs/iconnect.h
  62. 0 1
      include/configs/km/km_arm.h
  63. 0 1
      include/configs/lacie_kw.h
  64. 0 1
      include/configs/lsxl.h
  65. 0 1
      include/configs/mv88f6281gtw_ge.h
  66. 0 1
      include/configs/openrd.h
  67. 0 1
      include/configs/pogo_e02.h
  68. 0 1
      include/configs/rd6281a.h
  69. 0 1
      include/configs/sheevaplug.h
  70. 0 1
      include/configs/tk71.h
  71. 0 1
      include/configs/wireless_space.h

+ 4 - 71
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"

+ 89 - 0
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

+ 0 - 8
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"

+ 0 - 8
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"

+ 0 - 8
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"

+ 0 - 8
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"

+ 0 - 8
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"

+ 0 - 8
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"

+ 0 - 8
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"

+ 0 - 8
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"

+ 0 - 8
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"

+ 0 - 8
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"

+ 0 - 8
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"

+ 0 - 8
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"

+ 0 - 8
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"

+ 0 - 8
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"

+ 0 - 8
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"

+ 0 - 8
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"

+ 0 - 8
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"

+ 0 - 8
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"

+ 1 - 0
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

+ 1 - 0
configs/dns325_defconfig

@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_DNS325=y

+ 1 - 0
configs/dockstar_defconfig

@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_DOCKSTAR=y

+ 1 - 0
configs/dreamplug_defconfig

@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_DREAMPLUG=y

+ 1 - 0
configs/goflexhome_defconfig

@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_GOFLEXHOME=y

+ 1 - 0
configs/guruplug_defconfig

@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_GURUPLUG=y

+ 1 - 0
configs/ib62x0_defconfig

@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_IB62X0=y

+ 1 - 0
configs/iconnect_defconfig

@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_ICONNECT=y

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
configs/kmcoge5un_defconfig

@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="KM_COGE5UN"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y

+ 1 - 0
configs/kmnusa_defconfig

@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="KM_NUSA"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y

+ 1 - 0
configs/kmsugp1_defconfig

@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="KM_SUGP1"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y

+ 1 - 0
configs/kmsuv31_defconfig

@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="KM_SUV31"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y

+ 1 - 0
configs/lschlv2_defconfig

@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="LSCHLV2"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_LSXL=y

+ 1 - 0
configs/lsxhl_defconfig

@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="LSXHL"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_LSXL=y

+ 1 - 0
configs/mgcoge3un_defconfig

@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="KM_MGCOGE3UN"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y

+ 1 - 0
configs/mv88f6281gtw_ge_defconfig

@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_MV88F6281GTW_GE=y

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
configs/pogo_e02_defconfig

@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_POGO_E02=y

+ 1 - 0
configs/portl2_defconfig

@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="KM_PORTL2"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y

+ 1 - 0
configs/rd6281a_defconfig

@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_RD6281A=y

+ 1 - 0
configs/sheevaplug_defconfig

@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_SHEEVAPLUG=y

+ 1 - 0
configs/tk71_defconfig

@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_TK71=y

+ 1 - 0
configs/wireless_space_defconfig

@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_WIRELESS_SPACE=y

+ 0 - 1
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 */
 

+ 0 - 1
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 */

+ 0 - 1
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 */

+ 0 - 1
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 */

+ 0 - 1
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 */

+ 0 - 1
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 */
 

+ 0 - 1
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 */
 

+ 0 - 1
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 */
 

+ 0 - 1
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

+ 0 - 1
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 */

+ 0 - 1
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 */

+ 0 - 1
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 */

+ 0 - 1
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 */
 

+ 0 - 1
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 */

+ 0 - 1
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 */

+ 0 - 1
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

+ 0 - 1
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 */