Skip to content

Commit e4ffa98

Browse files
Bartosz Golaszewskiclaudiubeznea
authored andcommitted
arm64: Kconfig: provide a top-level switch for Microchip platforms
Microchip is the only platform that doesn't have a top-level switch for disabling all SoC families. Align it with other platforms and update the arm64 defconfig to keep the default config the same. Signed-off-by: Bartosz Golaszewski <[email protected]> Reviewed-by: Krzysztof Kozlowski <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Claudiu Beznea <[email protected]>
1 parent 6de23f8 commit e4ffa98

2 files changed

Lines changed: 5 additions & 6 deletions

File tree

arch/arm64/Kconfig.platforms

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -188,16 +188,15 @@ config ARCH_MESON
188188
This enables support for the arm64 based Amlogic SoCs
189189
such as the s905, S905X/D, S912, A113X/D or S905X/D2
190190

191-
menu "Microchip SoC support"
191+
menuconfig ARCH_MICROCHIP
192+
bool "Microchip SoC support"
192193

193-
config ARCH_MICROCHIP
194-
bool
194+
if ARCH_MICROCHIP
195195

196196
config ARCH_LAN969X
197197
bool "Microchip LAN969X SoC family"
198198
select PINCTRL
199199
select DW_APB_TIMER_OF
200-
select ARCH_MICROCHIP
201200
help
202201
This enables support for the Microchip LAN969X ARMv8-based
203202
SoC family of TSN-capable gigabit switches.
@@ -212,7 +211,6 @@ config ARCH_SPARX5
212211
bool "Microchip Sparx5 SoC family"
213212
select PINCTRL
214213
select DW_APB_TIMER_OF
215-
select ARCH_MICROCHIP
216214
help
217215
This enables support for the Microchip Sparx5 ARMv8-based
218216
SoC family of TSN-capable gigabit switches.
@@ -223,7 +221,7 @@ config ARCH_SPARX5
223221
security through TCAM-based frame processing using versatile
224222
content aware processor (VCAP).
225223

226-
endmenu
224+
endif
227225

228226
config ARCH_MMP
229227
bool "Marvell MMP SoC Family"

arch/arm64/configs/defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ CONFIG_ARCH_HISI=y
5757
CONFIG_ARCH_KEEMBAY=y
5858
CONFIG_ARCH_MEDIATEK=y
5959
CONFIG_ARCH_MESON=y
60+
CONFIG_ARCH_MICROCHIP=y
6061
CONFIG_ARCH_MVEBU=y
6162
CONFIG_ARCH_NXP=y
6263
CONFIG_ARCH_LAYERSCAPE=y

0 commit comments

Comments
 (0)