Move the SoC config options to the top to be able to get a quick overview over the supported SoCs.
Change the comment lines that separate board with different SoCs to use the proper SoC marketing names. Move the XLOAD option to the bottom to make it available as a separate feature that is only available if an appropriate board is selected. Signed-off-by: Michael Tretter <[email protected]> --- arch/arm/mach-socfpga/Kconfig | 52 +++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/arch/arm/mach-socfpga/Kconfig b/arch/arm/mach-socfpga/Kconfig index 343264209267..a836711e6c40 100644 --- a/arch/arm/mach-socfpga/Kconfig +++ b/arch/arm/mach-socfpga/Kconfig @@ -1,15 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only -if ARCH_SOCFPGA - -config ARCH_SOCFPGA_XLOAD - bool - depends on ARCH_SOCFPGA_CYCLONE5 - prompt "Build SoCFPGA preloader image" - -menu "SoCFPGA boards" - -if 32BIT +menu "SoCFPGA Features" + depends on ARCH_SOCFPGA config ARCH_SOCFPGA_CYCLONE5 bool @@ -28,7 +20,20 @@ config ARCH_SOCFPGA_ARRIA10 select OFTREE select MCI_DW_PBL -comment "Cyclone5 boards" +config ARCH_SOCFPGA_AGILEX5 + bool + select CPU_V8 + select RESET_CONTROLLER + select RESET_SIMPLE + select OFDEVICE + select OFTREE + select FIRMWARE_AGILEX5_ATF + select ARM_ATF + select ARM_SMCCC + +if 32BIT + +comment "Cyclone V boards" config MACH_SOCFPGA_ALTERA_SOCDK select ARCH_SOCFPGA_CYCLONE5 @@ -58,7 +63,7 @@ config MACH_SOCFPGA_TERASIC_SOCKIT select ARCH_SOCFPGA_CYCLONE5 bool "Terasic SoCKit" -comment "Arria10 boards" +comment "Arria 10 boards" config MACH_SOCFPGA_ENCLUSTRA_AA1 select ARCH_SOCFPGA_ARRIA10 @@ -72,19 +77,7 @@ endif if 64BIT -config ARCH_SOCFPGA_AGILEX5 - bool - select CPU_V8 - select RESET_CONTROLLER - select RESET_SIMPLE - select OFDEVICE - select OFTREE - select FIRMWARE_AGILEX5_ATF - select ARM_ATF - select ARM_SMCCC - - -comment "SoCFPGA Agilex5 boards" +comment "Agilex 5 boards" config MACH_SOCFPGA_ARROW_AXE5_EAGLE bool "Arrow AXE5 Eagle" @@ -92,6 +85,11 @@ config MACH_SOCFPGA_ARROW_AXE5_EAGLE endif -endmenu +comment "board features" -endif +config ARCH_SOCFPGA_XLOAD + bool + depends on ARCH_SOCFPGA_CYCLONE5 + prompt "Build SoCFPGA preloader image" + +endmenu -- 2.47.3
