[PATCH 0/3] arm: socfpga: cleanup Kconfig

[PATCH 0/3] arm: socfpga: cleanup Kconfig

[Michael Tretter]

Reorganize the SoCFPGA configuration menu. Move the entire configuration
into a submenu, move the ARCH for all SoCs above the board options and
move special features that depend on the ARCH below the boards.

Patch 1 fixes the formatting of the Kconfig file and replaces
spaces with tabs.

Patch 2 reorganizes the menu.

Patch 3 regenerates the defconfig files after the menu reorganization.

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
Michael Tretter (3):
      arm: socfgpa: use tabs for indent in Kconfig
      arm: socfpga: reorganize Kconfig menu
      arm: socfpga: regenerate defconfig files

 arch/arm/configs/socfpga-agilex5_defconfig |  1 -
 arch/arm/configs/socfpga-arria10_defconfig |  8 +----
 arch/arm/configs/socfpga-xload_defconfig   |  2 +-
 arch/arm/configs/socfpga_defconfig         |  4 ---
 arch/arm/mach-socfpga/Kconfig              | 56 ++++++++++++++----------------
 5 files changed, 29 insertions(+), 42 deletions(-)
---
base-commit: 2cb5e0014a37160731ad6eb6d7f7d846394db362
change-id: 20260513-socfpga-kconfig-eed9bf3960b1

Best regards,
-- 
Michael Tretter <m.tretter@pengutronix.de>

[PATCH 1/3] arm: socfgpa: use tabs for indent in Kconfig

[Michael Tretter]

The Kconfig files should use tabs for indents.

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
 arch/arm/mach-socfpga/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-socfpga/Kconfig b/arch/arm/mach-socfpga/Kconfig
index 734d2c6d7aa3..343264209267 100644
--- a/arch/arm/mach-socfpga/Kconfig
+++ b/arch/arm/mach-socfpga/Kconfig
@@ -87,8 +87,8 @@ config ARCH_SOCFPGA_AGILEX5
 comment "SoCFPGA Agilex5 boards"
 
 config MACH_SOCFPGA_ARROW_AXE5_EAGLE
-       bool "Arrow AXE5 Eagle"
-       select ARCH_SOCFPGA_AGILEX5
+	bool "Arrow AXE5 Eagle"
+	select ARCH_SOCFPGA_AGILEX5
 
 endif
 

-- 
2.47.3

[PATCH 2/3] arm: socfpga: reorganize Kconfig menu

[Michael Tretter]

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 <m.tretter@pengutronix.de>
---
 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

[PATCH 3/3] arm: socfpga: regenerate defconfig files

[Michael Tretter]

Cleanup the defconfig files by running `make defconfig` and `make
savedefconfig` to get rid of unnecessarily selected options and sort
options.

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
 arch/arm/configs/socfpga-agilex5_defconfig | 1 -
 arch/arm/configs/socfpga-arria10_defconfig | 8 +-------
 arch/arm/configs/socfpga-xload_defconfig   | 2 +-
 arch/arm/configs/socfpga_defconfig         | 4 ----
 4 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/arch/arm/configs/socfpga-agilex5_defconfig b/arch/arm/configs/socfpga-agilex5_defconfig
index 5711cb89ed27..2cfeef3ec30c 100644
--- a/arch/arm/configs/socfpga-agilex5_defconfig
+++ b/arch/arm/configs/socfpga-agilex5_defconfig
@@ -1,5 +1,4 @@
 CONFIG_ARCH_SOCFPGA=y
-CONFIG_64BIT=y
 CONFIG_MACH_SOCFPGA_ARROW_AXE5_EAGLE=y
 CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
 CONFIG_MMU=y
diff --git a/arch/arm/configs/socfpga-arria10_defconfig b/arch/arm/configs/socfpga-arria10_defconfig
index f3c9993dcf06..46cd25a8254f 100644
--- a/arch/arm/configs/socfpga-arria10_defconfig
+++ b/arch/arm/configs/socfpga-arria10_defconfig
@@ -6,9 +6,7 @@ CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
 CONFIG_ARM_UNWIND=y
 CONFIG_NAME="socfpga-arria10_defconfig"
 CONFIG_MALLOC_SIZE=0x0
-CONFIG_MALLOC_TLSF=y
 CONFIG_KALLSYMS=y
-CONFIG_RELOCATABLE=y
 CONFIG_HUSH_FANCY_PROMPT=y
 CONFIG_CMDLINE_EDITING=y
 CONFIG_AUTO_COMPLETE=y
@@ -17,7 +15,6 @@ CONFIG_MENU=y
 CONFIG_BOOTM_SHOW_TYPE=y
 CONFIG_BOOTM_VERBOSE=y
 CONFIG_BOOTM_INITRD=y
-CONFIG_BOOTM_OFTREE=y
 CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
 CONFIG_STATE=y
 CONFIG_LONGHELP=y
@@ -60,7 +57,6 @@ CONFIG_CMD_OF_NODE=y
 CONFIG_CMD_OF_PROPERTY=y
 CONFIG_CMD_OFTREE=y
 CONFIG_CMD_TIME=y
-CONFIG_CMD_STATE=y
 CONFIG_NET=y
 CONFIG_NET_NETCONSOLE=y
 CONFIG_OF_BAREBOX_DRIVERS=y
@@ -73,13 +69,11 @@ CONFIG_MCI=y
 CONFIG_MCI_STARTUP=y
 CONFIG_MCI_MMC_BOOT_PARTITIONS=y
 CONFIG_MCI_DW=y
-CONFIG_STATE_DRV=y
 # CONFIG_PINCTRL is not set
 CONFIG_FS_TFTP=y
 CONFIG_FS_NFS=y
 CONFIG_FS_FAT=y
 CONFIG_FS_FAT_WRITE=y
-CONFIG_FS_FAT_LFN=y
+CONFIG_DIGEST_SHA256_ARM=y
 CONFIG_ZLIB=y
 CONFIG_LZO_DECOMPRESS=y
-CONFIG_DIGEST_SHA256_ARM=y
diff --git a/arch/arm/configs/socfpga-xload_defconfig b/arch/arm/configs/socfpga-xload_defconfig
index ec966c91a8f7..31050cde6683 100644
--- a/arch/arm/configs/socfpga-xload_defconfig
+++ b/arch/arm/configs/socfpga-xload_defconfig
@@ -1,12 +1,12 @@
 CONFIG_ARCH_SOCFPGA=y
 # CONFIG_CPU_V7VE is not set
-CONFIG_ARCH_SOCFPGA_XLOAD=y
 CONFIG_MACH_SOCFPGA_ALTERA_SOCDK=y
 CONFIG_MACH_SOCFPGA_EBV_SOCRATES=y
 CONFIG_MACH_SOCFPGA_ENCLUSTRA_SA2=y
 CONFIG_MACH_SOCFPGA_TERASIC_DE0_NANO_SOC=y
 CONFIG_MACH_SOCFPGA_TERASIC_DE10_NANO=y
 CONFIG_MACH_SOCFPGA_TERASIC_SOCKIT=y
+CONFIG_ARCH_SOCFPGA_XLOAD=y
 CONFIG_THUMB2_BAREBOX=y
 CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
 # CONFIG_ARM_EXCEPTIONS is not set
diff --git a/arch/arm/configs/socfpga_defconfig b/arch/arm/configs/socfpga_defconfig
index 8f9e34d459ff..4f879cd45f0f 100644
--- a/arch/arm/configs/socfpga_defconfig
+++ b/arch/arm/configs/socfpga_defconfig
@@ -11,9 +11,7 @@ CONFIG_ARM_UNWIND=y
 CONFIG_NAME="socfpga_defconfig"
 CONFIG_MMU=y
 CONFIG_MALLOC_SIZE=0x0
-CONFIG_MALLOC_TLSF=y
 CONFIG_KALLSYMS=y
-CONFIG_RELOCATABLE=y
 CONFIG_HUSH_FANCY_PROMPT=y
 CONFIG_CMDLINE_EDITING=y
 CONFIG_AUTO_COMPLETE=y
@@ -22,7 +20,6 @@ CONFIG_MENU=y
 CONFIG_BOOTM_SHOW_TYPE=y
 CONFIG_BOOTM_VERBOSE=y
 CONFIG_BOOTM_INITRD=y
-CONFIG_BOOTM_OFTREE=y
 CONFIG_CONSOLE_ACTIVATE_NONE=y
 CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
 CONFIG_LONGHELP=y
@@ -114,4 +111,3 @@ CONFIG_FS_TFTP=y
 CONFIG_FS_NFS=y
 CONFIG_FS_FAT=y
 CONFIG_FS_FAT_WRITE=y
-CONFIG_FS_FAT_LFN=y

-- 
2.47.3

Re: [PATCH 0/3] arm: socfpga: cleanup Kconfig

[Sascha Hauer]

On Wed, 13 May 2026 14:20:16 +0200, Michael Tretter wrote:
> Reorganize the SoCFPGA configuration menu. Move the entire configuration
> into a submenu, move the ARCH for all SoCs above the board options and
> move special features that depend on the ARCH below the boards.
> 
> Patch 1 fixes the formatting of the Kconfig file and replaces
> spaces with tabs.
> 
> [...]

Applied, thanks!

[1/3] arm: socfgpa: use tabs for indent in Kconfig
      https://git.pengutronix.de/cgit/barebox/commit/?id=6852489ce376 (link may not be stable)
[2/3] arm: socfpga: reorganize Kconfig menu
      https://git.pengutronix.de/cgit/barebox/commit/?id=4bd5ed8785eb (link may not be stable)
[3/3] arm: socfpga: regenerate defconfig files
      https://git.pengutronix.de/cgit/barebox/commit/?id=759c82d32c53 (link may not be stable)

Best regards,
-- 
Sascha Hauer <s.hauer@pengutronix.de>