Skip to content

Commit 47539e2

Browse files
masahir0ytrini
masahir0y
authored and
trini
committed
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 <[email protected]> Acked-by: Prafulla Wadasdkar <[email protected]> Cc: Luka Perkov <[email protected]>
1 parent ad17a81 commit 47539e2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+127
-232
lines changed

‎arch/arm/Kconfig

Lines changed: 4 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -179,59 +179,8 @@ config TARGET_ENBW_CMC
179179
config TARGET_CALIMAIN
180180
bool "Support calimain"
181181

182-
config TARGET_LSXL
183-
bool "Support lsxl"
184-
185-
config TARGET_POGO_E02
186-
bool "Support pogo_e02"
187-
188-
config TARGET_DNS325
189-
bool "Support dns325"
190-
191-
config TARGET_ICONNECT
192-
bool "Support iconnect"
193-
194-
config TARGET_TK71
195-
bool "Support tk71"
196-
197-
config TARGET_KM_KIRKWOOD
198-
bool "Support km_kirkwood"
199-
200-
config TARGET_NET2BIG_V2
201-
bool "Support net2big_v2"
202-
203-
config TARGET_NETSPACE_V2
204-
bool "Support netspace_v2"
205-
206-
config TARGET_WIRELESS_SPACE
207-
bool "Support wireless_space"
208-
209-
config TARGET_DREAMPLUG
210-
bool "Support dreamplug"
211-
212-
config TARGET_GURUPLUG
213-
bool "Support guruplug"
214-
215-
config TARGET_MV88F6281GTW_GE
216-
bool "Support mv88f6281gtw_ge"
217-
218-
config TARGET_OPENRD
219-
bool "Support openrd"
220-
221-
config TARGET_RD6281A
222-
bool "Support rd6281a"
223-
224-
config TARGET_SHEEVAPLUG
225-
bool "Support sheevaplug"
226-
227-
config TARGET_IB62X0
228-
bool "Support ib62x0"
229-
230-
config TARGET_DOCKSTAR
231-
bool "Support dockstar"
232-
233-
config TARGET_GOFLEXHOME
234-
bool "Support goflexhome"
182+
config KIRKWOOD
183+
bool "Marvell Kirkwood"
235184

236185
config TARGET_DEVKIT3250
237186
bool "Support devkit3250"
@@ -710,6 +659,8 @@ config TARGET_JORNADA
710659

711660
endchoice
712661

662+
source "arch/arm/cpu/arm926ejs/kirkwood/Kconfig"
663+
713664
source "arch/arm/cpu/armv7/rmobile/Kconfig"
714665

715666
source "arch/arm/cpu/armv7/tegra-common/Kconfig"
@@ -727,20 +678,9 @@ source "board/BuS/eb_cpux9k2/Kconfig"
727678
source "board/BuS/vl_ma2sc/Kconfig"
728679
source "board/CarMediaLab/flea3/Kconfig"
729680
source "board/LaCie/edminiv2/Kconfig"
730-
source "board/LaCie/net2big_v2/Kconfig"
731-
source "board/LaCie/netspace_v2/Kconfig"
732-
source "board/LaCie/wireless_space/Kconfig"
733681
source "board/Marvell/aspenite/Kconfig"
734682
source "board/Marvell/dkb/Kconfig"
735-
source "board/Marvell/dreamplug/Kconfig"
736683
source "board/Marvell/gplugd/Kconfig"
737-
source "board/Marvell/guruplug/Kconfig"
738-
source "board/Marvell/mv88f6281gtw_ge/Kconfig"
739-
source "board/Marvell/openrd/Kconfig"
740-
source "board/Marvell/rd6281a/Kconfig"
741-
source "board/Marvell/sheevaplug/Kconfig"
742-
source "board/Seagate/dockstar/Kconfig"
743-
source "board/Seagate/goflexhome/Kconfig"
744684
source "board/afeb9260/Kconfig"
745685
source "board/ait/cam_enc_4xx/Kconfig"
746686
source "board/altera/socfpga/Kconfig"
@@ -766,12 +706,10 @@ source "board/boundary/nitrogen6x/Kconfig"
766706
source "board/broadcom/bcm28155_ap/Kconfig"
767707
source "board/broadcom/bcm958300k/Kconfig"
768708
source "board/broadcom/bcm958622hr/Kconfig"
769-
source "board/buffalo/lsxl/Kconfig"
770709
source "board/calao/sbc35_a9g20/Kconfig"
771710
source "board/calao/tny_a9260/Kconfig"
772711
source "board/calao/usb_a9263/Kconfig"
773712
source "board/cirrus/edb93xx/Kconfig"
774-
source "board/cloudengines/pogo_e02/Kconfig"
775713
source "board/cm4008/Kconfig"
776714
source "board/cm41xx/Kconfig"
777715
source "board/comelit/dig297/Kconfig"
@@ -781,7 +719,6 @@ source "board/compulab/cm_t54/Kconfig"
781719
source "board/congatec/cgtqmx6eval/Kconfig"
782720
source "board/corscience/tricorder/Kconfig"
783721
source "board/creative/xfi3/Kconfig"
784-
source "board/d-link/dns325/Kconfig"
785722
source "board/davedenx/qong/Kconfig"
786723
source "board/davinci/da8xxevm/Kconfig"
787724
source "board/davinci/dm355evm/Kconfig"
@@ -833,13 +770,10 @@ source "board/highbank/Kconfig"
833770
source "board/htkw/mcx/Kconfig"
834771
source "board/icpdas/lp8x4x/Kconfig"
835772
source "board/imx31_phycore/Kconfig"
836-
source "board/iomega/iconnect/Kconfig"
837773
source "board/isee/igep0033/Kconfig"
838774
source "board/isee/igep00x0/Kconfig"
839775
source "board/jornada/Kconfig"
840-
source "board/karo/tk71/Kconfig"
841776
source "board/karo/tx25/Kconfig"
842-
source "board/keymile/km_arm/Kconfig"
843777
source "board/logicpd/am3517evm/Kconfig"
844778
source "board/logicpd/imx27lite/Kconfig"
845779
source "board/logicpd/imx31_litekit/Kconfig"
@@ -858,7 +792,6 @@ source "board/pandora/Kconfig"
858792
source "board/phytec/pcm051/Kconfig"
859793
source "board/ppcag/bg0900/Kconfig"
860794
source "board/pxa255_idp/Kconfig"
861-
source "board/raidsonic/ib62x0/Kconfig"
862795
source "board/raspberrypi/rpi_b/Kconfig"
863796
source "board/ronetix/pm9261/Kconfig"
864797
source "board/ronetix/pm9263/Kconfig"

‎arch/arm/cpu/arm926ejs/kirkwood/Kconfig

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
if KIRKWOOD
2+
3+
choice
4+
prompt "Marvell Kirkwood board select"
5+
6+
config TARGET_OPENRD
7+
bool "Marvell OpenRD Board"
8+
9+
config TARGET_MV88F6281GTW_GE
10+
bool "MV88f6281GTW_GE Board"
11+
12+
config TARGET_RD6281A
13+
bool "RD6281A Board"
14+
15+
config TARGET_DREAMPLUG
16+
bool "DreamPlug Board"
17+
18+
config TARGET_GURUPLUG
19+
bool "GuruPlug Board"
20+
21+
config TARGET_SHEEVAPLUG
22+
bool "SheevaPlug Board"
23+
24+
config TARGET_LSXL
25+
bool "lsxl Board"
26+
27+
config TARGET_POGO_E02
28+
bool "pogo_e02 Board"
29+
30+
config TARGET_DNS325
31+
bool "dns325 Board"
32+
33+
config TARGET_ICONNECT
34+
bool "iconnect Board"
35+
36+
config TARGET_TK71
37+
bool "TK71 Board"
38+
39+
config TARGET_KM_KIRKWOOD
40+
bool "KM_KIRKWOOD Board"
41+
42+
config TARGET_NET2BIG_V2
43+
bool "LaCie 2Big Network v2 NAS Board"
44+
45+
config TARGET_NETSPACE_V2
46+
bool "LaCie netspace_v2 Board"
47+
48+
config TARGET_WIRELESS_SPACE
49+
bool "LaCie Wireless_space Board"
50+
51+
config TARGET_IB62X0
52+
bool "ib62x0 Board"
53+
54+
config TARGET_DOCKSTAR
55+
bool "Dockstar Board"
56+
57+
config TARGET_GOFLEXHOME
58+
bool "GoFlex Home Board"
59+
60+
endchoice
61+
62+
config SYS_CPU
63+
string
64+
default "arm926ejs"
65+
66+
config SYS_SOC
67+
string
68+
default "kirkwood"
69+
70+
source "board/Marvell/openrd/Kconfig"
71+
source "board/Marvell/mv88f6281gtw_ge/Kconfig"
72+
source "board/Marvell/rd6281a/Kconfig"
73+
source "board/Marvell/dreamplug/Kconfig"
74+
source "board/Marvell/guruplug/Kconfig"
75+
source "board/Marvell/sheevaplug/Kconfig"
76+
source "board/buffalo/lsxl/Kconfig"
77+
source "board/cloudengines/pogo_e02/Kconfig"
78+
source "board/d-link/dns325/Kconfig"
79+
source "board/iomega/iconnect/Kconfig"
80+
source "board/karo/tk71/Kconfig"
81+
source "board/keymile/km_arm/Kconfig"
82+
source "board/LaCie/net2big_v2/Kconfig"
83+
source "board/LaCie/netspace_v2/Kconfig"
84+
source "board/LaCie/wireless_space/Kconfig"
85+
source "board/raidsonic/ib62x0/Kconfig"
86+
source "board/Seagate/dockstar/Kconfig"
87+
source "board/Seagate/goflexhome/Kconfig"
88+
89+
endif

‎board/LaCie/net2big_v2/Kconfig

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
if TARGET_NET2BIG_V2
22

3-
config SYS_CPU
4-
string
5-
default "arm926ejs"
6-
73
config SYS_BOARD
84
string
95
default "net2big_v2"
@@ -12,10 +8,6 @@ config SYS_VENDOR
128
string
139
default "LaCie"
1410

15-
config SYS_SOC
16-
string
17-
default "kirkwood"
18-
1911
config SYS_CONFIG_NAME
2012
string
2113
default "lacie_kw"

‎board/LaCie/netspace_v2/Kconfig

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
if TARGET_NETSPACE_V2
22

3-
config SYS_CPU
4-
string
5-
default "arm926ejs"
6-
73
config SYS_BOARD
84
string
95
default "netspace_v2"
@@ -12,10 +8,6 @@ config SYS_VENDOR
128
string
139
default "LaCie"
1410

15-
config SYS_SOC
16-
string
17-
default "kirkwood"
18-
1911
config SYS_CONFIG_NAME
2012
string
2113
default "lacie_kw"

‎board/LaCie/wireless_space/Kconfig

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
if TARGET_WIRELESS_SPACE
22

3-
config SYS_CPU
4-
string
5-
default "arm926ejs"
6-
73
config SYS_BOARD
84
string
95
default "wireless_space"
@@ -12,10 +8,6 @@ config SYS_VENDOR
128
string
139
default "LaCie"
1410

15-
config SYS_SOC
16-
string
17-
default "kirkwood"
18-
1911
config SYS_CONFIG_NAME
2012
string
2113
default "wireless_space"

‎board/Marvell/dreamplug/Kconfig

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
if TARGET_DREAMPLUG
22

3-
config SYS_CPU
4-
string
5-
default "arm926ejs"
6-
73
config SYS_BOARD
84
string
95
default "dreamplug"
@@ -12,10 +8,6 @@ config SYS_VENDOR
128
string
139
default "Marvell"
1410

15-
config SYS_SOC
16-
string
17-
default "kirkwood"
18-
1911
config SYS_CONFIG_NAME
2012
string
2113
default "dreamplug"

‎board/Marvell/guruplug/Kconfig

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
if TARGET_GURUPLUG
22

3-
config SYS_CPU
4-
string
5-
default "arm926ejs"
6-
73
config SYS_BOARD
84
string
95
default "guruplug"
@@ -12,10 +8,6 @@ config SYS_VENDOR
128
string
139
default "Marvell"
1410

15-
config SYS_SOC
16-
string
17-
default "kirkwood"
18-
1911
config SYS_CONFIG_NAME
2012
string
2113
default "guruplug"

‎board/Marvell/mv88f6281gtw_ge/Kconfig

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
if TARGET_MV88F6281GTW_GE
22

3-
config SYS_CPU
4-
string
5-
default "arm926ejs"
6-
73
config SYS_BOARD
84
string
95
default "mv88f6281gtw_ge"
@@ -12,10 +8,6 @@ config SYS_VENDOR
128
string
139
default "Marvell"
1410

15-
config SYS_SOC
16-
string
17-
default "kirkwood"
18-
1911
config SYS_CONFIG_NAME
2012
string
2113
default "mv88f6281gtw_ge"

‎board/Marvell/openrd/Kconfig

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
if TARGET_OPENRD
22

3-
config SYS_CPU
4-
string
5-
default "arm926ejs"
6-
73
config SYS_BOARD
84
string
95
default "openrd"
@@ -12,10 +8,6 @@ config SYS_VENDOR
128
string
139
default "Marvell"
1410

15-
config SYS_SOC
16-
string
17-
default "kirkwood"
18-
1911
config SYS_CONFIG_NAME
2012
string
2113
default "openrd"

‎board/Marvell/rd6281a/Kconfig

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
if TARGET_RD6281A
22

3-
config SYS_CPU
4-
string
5-
default "arm926ejs"
6-
73
config SYS_BOARD
84
string
95
default "rd6281a"
@@ -12,10 +8,6 @@ config SYS_VENDOR
128
string
139
default "Marvell"
1410

15-
config SYS_SOC
16-
string
17-
default "kirkwood"
18-
1911
config SYS_CONFIG_NAME
2012
string
2113
default "rd6281a"

0 commit comments

Comments
 (0)