Kconfig: Centralize prompting for SYS_CONFIG_NAME

Generally speaking, we do not prompt for this value and define it in the
board specific Kconfig file. There are some valid use cases however
today where we do prompt for this value, so instead of having this be
done in a number of locations, do this at the top-level location only.

This removes the question from a number of other locations and makes it
consistent that when we do set the value directly, we always do it the
same way. We don't need to specify the type, it's always string.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/Kconfig b/arch/Kconfig
index b6fb9e9..0d3cce9 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -361,7 +361,16 @@ config SYS_BOARD
          leave this option empty.
 
 config SYS_CONFIG_NAME
-       string
+       string "Board header file" if ARCH_MESON || ARCH_VERSAL || \
+               ARCH_VERSAL_NET || ARCH_ZYNQ || ARCH_ZYNQMP || \
+               ARCH_ZYNQMP_R5 || MICROBLAZE || NIOS2
+       default "meson64" if ARCH_MESON
+       default "microblaze-generic" if MICROBLAZE
+       default "xilinx_versal" if ARCH_VERSAL
+       default "xilinx_versal_net" if ARCH_VERSAL_NET
+       default "xilinx_zynqmp" if ARCH_ZYNQMP
+       default "xilinx_zynqmp_r5" if ARCH_ZYNQMP_R5
+       default "zynq-common" if ARCH_ZYNQ
        help
          This option should contain the base name of board header file.
          The header file include/configs/<CONFIG_SYS_CONFIG_NAME>.h

diff --git a/arch/arm/mach-mediatek/Kconfig b/arch/arm/mach-mediatek/Kconfig
index c3872f4..82018bd 100644 (file)
--- a/arch/arm/mach-mediatek/Kconfig
+++ b/arch/arm/mach-mediatek/Kconfig
@@ -133,7 +133,6 @@ config SYS_BOARD
          be used.
 
 config SYS_CONFIG_NAME
-       string "Board configuration name"
        default "mt7622" if TARGET_MT7622
        default "mt7623" if TARGET_MT7623
        default "mt7629" if TARGET_MT7629
@@ -145,11 +144,6 @@ config SYS_CONFIG_NAME
        default "mt8512" if TARGET_MT8512
        default "mt8516" if TARGET_MT8516
        default "mt8518" if TARGET_MT8518
-       default ""
-       help
-         This option contains information about board configuration name.
-         Based on this option include/configs/<CONFIG_SYS_CONFIG_NAME>.h header
-         will be used for board configuration.
 
 config MTK_BROM_HEADER_INFO
        string

diff --git a/arch/arm/mach-meson/Kconfig b/arch/arm/mach-meson/Kconfig
index d6c8905..6e6f9c1 100644 (file)
--- a/arch/arm/mach-meson/Kconfig
+++ b/arch/arm/mach-meson/Kconfig
@@ -88,12 +88,4 @@ config SYS_BOARD
          Based on this option board/<CONFIG_SYS_VENDOR>/<CONFIG_SYS_BOARD> will
          be used.
 
-config SYS_CONFIG_NAME
-       string "Board configuration name"
-       default "meson64"
-       help
-         This option contains information about board configuration name.
-         Based on this option include/configs/<CONFIG_SYS_CONFIG_NAME>.h header
-         will be used for board configuration.
-
 endif

diff --git a/arch/arm/mach-versal-net/Kconfig b/arch/arm/mach-versal-net/Kconfig
index edff5b0..1b53399 100644 (file)
--- a/arch/arm/mach-versal-net/Kconfig
+++ b/arch/arm/mach-versal-net/Kconfig
@@ -13,14 +13,6 @@ config SYS_VENDOR
 config SYS_SOC
        default "versal-net"
 
-config SYS_CONFIG_NAME
-       string "Board configuration name"
-       default "xilinx_versal_net"
-       help
-         This option contains information about board configuration name.
-         Based on this option include/configs/<CONFIG_SYS_CONFIG_NAME>.h header
-         will be used for board configuration.
-
 config COUNTER_FREQUENCY
        int "Timer clock frequency"
        default 0

diff --git a/arch/arm/mach-versal/Kconfig b/arch/arm/mach-versal/Kconfig
index 645f06a..629a141 100644 (file)
--- a/arch/arm/mach-versal/Kconfig
+++ b/arch/arm/mach-versal/Kconfig
@@ -13,14 +13,6 @@ config SYS_VENDOR
 config SYS_SOC
        default "versal"
 
-config SYS_CONFIG_NAME
-       string "Board configuration name"
-       default "xilinx_versal"
-       help
-         This option contains information about board configuration name.
-         Based on this option include/configs/<CONFIG_SYS_CONFIG_NAME>.h header
-         will be used for board configuration.
-
 config SYS_MALLOC_LEN
        default 0x2000000
 

diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig
index b4c439b..265e9ce 100644 (file)
--- a/arch/arm/mach-zynq/Kconfig
+++ b/arch/arm/mach-zynq/Kconfig
@@ -43,14 +43,6 @@ config SYS_VENDOR
 config SYS_SOC
        default "zynq"
 
-config SYS_CONFIG_NAME
-       string "Board configuration name"
-       default "zynq-common"
-       help
-         This option contains information about board configuration name.
-         Based on this option include/configs/<CONFIG_SYS_CONFIG_NAME>.h header
-         will be used for board configuration.
-
 config SYS_MALLOC_F_LEN
        default 0x800
 

diff --git a/arch/arm/mach-zynqmp-r5/Kconfig b/arch/arm/mach-zynqmp-r5/Kconfig
index f14514b..b2ba896 100644 (file)
--- a/arch/arm/mach-zynqmp-r5/Kconfig
+++ b/arch/arm/mach-zynqmp-r5/Kconfig
@@ -13,14 +13,6 @@ config SYS_VENDOR
 config SYS_SOC
        default "zynqmp-r5"
 
-config SYS_CONFIG_NAME
-       string "Board configuration name"
-       default "xilinx_zynqmp_r5"
-       help
-         This option contains information about board configuration name.
-         Based on this option include/configs/<CONFIG_SYS_CONFIG_NAME>.h header
-         will be used for board configuration.
-
 config CPU_FREQ_HZ
        int "CPU frequency"
        default 800000000

diff --git a/arch/arm/mach-zynqmp/Kconfig b/arch/arm/mach-zynqmp/Kconfig
index 7e7c87d..6a7be0b 100644 (file)
--- a/arch/arm/mach-zynqmp/Kconfig
+++ b/arch/arm/mach-zynqmp/Kconfig
@@ -35,14 +35,6 @@ config SYS_VENDOR
 config SYS_SOC
        default "zynqmp"
 
-config SYS_CONFIG_NAME
-       string "Board configuration name"
-       default "xilinx_zynqmp"
-       help
-         This option contains information about board configuration name.
-         Based on this option include/configs/<CONFIG_SYS_CONFIG_NAME>.h header
-         will be used for board configuration.
-
 config SYS_MEM_RSVD_FOR_MMU
        bool "Reserve memory for MMU Table"
        help

diff --git a/arch/mips/mach-mtmips/mt7620/Kconfig b/arch/mips/mach-mtmips/mt7620/Kconfig
index 3ca711a..398c7c6 100644 (file)
--- a/arch/mips/mach-mtmips/mt7620/Kconfig
+++ b/arch/mips/mach-mtmips/mt7620/Kconfig
@@ -67,7 +67,6 @@ config CPU_FREQ_MULTI
        default 7 if CPU_FREQ_620MHZ
 
 config SYS_CONFIG_NAME
-       string "Board configuration name"
        default "mt7620" if  BOARD_MT7620_RFB || BOARD_MT7620_MT7530_RFB
 
 config SYS_BOARD

diff --git a/arch/mips/mach-mtmips/mt7621/Kconfig b/arch/mips/mach-mtmips/mt7621/Kconfig
index 008a28f..8fe6e0a 100644 (file)
--- a/arch/mips/mach-mtmips/mt7621/Kconfig
+++ b/arch/mips/mach-mtmips/mt7621/Kconfig
@@ -102,7 +102,6 @@ config BOARD_MT7621_NAND_RFB
 endchoice
 
 config SYS_CONFIG_NAME
-       string "Board configuration name"
        default "mt7621" if  BOARD_MT7621_RFB || BOARD_MT7621_NAND_RFB
 
 config SYS_BOARD

diff --git a/arch/mips/mach-mtmips/mt7628/Kconfig b/arch/mips/mach-mtmips/mt7628/Kconfig
index e727359..79b2ddc 100644 (file)
--- a/arch/mips/mach-mtmips/mt7628/Kconfig
+++ b/arch/mips/mach-mtmips/mt7628/Kconfig
@@ -49,7 +49,6 @@ config SYS_BOARD
        default "mt7628" if BOARD_MT7628_RFB
 
 config SYS_CONFIG_NAME
-       string "Board configuration name"
        default "mt7628" if BOARD_MT7628_RFB
 
 source "board/gardena/smart-gateway-mt7688/Kconfig"

diff --git a/arch/nios2/Kconfig b/arch/nios2/Kconfig
index bb4fb2a..b06b3ef 100644 (file)
--- a/arch/nios2/Kconfig
+++ b/arch/nios2/Kconfig
@@ -4,11 +4,4 @@ menu "Nios II architecture"
 config SYS_ARCH
        default "nios2"
 
-config SYS_CONFIG_NAME
-       string "Board header file"
-       help
-         This option should contain the base name of board header file.
-         The header file include/configs/<CONFIG_SYS_CONFIG_NAME>.h
-         should be included from include/config.h.
-
 endmenu

diff --git a/board/Marvell/octeon_ebb7304/Kconfig b/board/Marvell/octeon_ebb7304/Kconfig
index ab54e6d..b3244f7 100644 (file)
--- a/board/Marvell/octeon_ebb7304/Kconfig
+++ b/board/Marvell/octeon_ebb7304/Kconfig
@@ -9,7 +9,6 @@ config SYS_VENDOR
        default "Marvell"
 
 config SYS_CONFIG_NAME
-       string
        default "octeon_ebb7304"
 
 config DEFAULT_DEVICE_TREE

diff --git a/board/Marvell/octeon_nic23/Kconfig b/board/Marvell/octeon_nic23/Kconfig
index 3c42e8a..468bbb7 100644 (file)
--- a/board/Marvell/octeon_nic23/Kconfig
+++ b/board/Marvell/octeon_nic23/Kconfig
@@ -9,7 +9,6 @@ config SYS_VENDOR
        default "Marvell"
 
 config SYS_CONFIG_NAME
-       string
        default "octeon_nic23"
 
 config DEFAULT_DEVICE_TREE

diff --git a/board/cadence/xtfpga/Kconfig b/board/cadence/xtfpga/Kconfig
index 69296be..a64961e 100644 (file)
--- a/board/cadence/xtfpga/Kconfig
+++ b/board/cadence/xtfpga/Kconfig
@@ -25,7 +25,6 @@ config SYS_VENDOR
        default "cadence"
 
 config SYS_CONFIG_NAME
-       string
        default "xtfpga"
 
 config BOARD_SDRAM_SIZE

diff --git a/board/cavium/thunderx/Kconfig b/board/cavium/thunderx/Kconfig
index 927d876..3d4b260 100644 (file)
--- a/board/cavium/thunderx/Kconfig
+++ b/board/cavium/thunderx/Kconfig
@@ -13,7 +13,6 @@ config SYS_VENDOR
        default "cavium"
 
 config SYS_CONFIG_NAME
-       string
        default "thunderx_88xx"
 
 config CMD_ATF

diff --git a/board/freescale/imxrt1020-evk/Kconfig b/board/freescale/imxrt1020-evk/Kconfig
index d00cbff..3cb8fb1 100644 (file)
--- a/board/freescale/imxrt1020-evk/Kconfig
+++ b/board/freescale/imxrt1020-evk/Kconfig
@@ -13,7 +13,6 @@ config SYS_SOC
        default "imxrt1020"
 
 config SYS_CONFIG_NAME
-       string
        default "imxrt1020-evk"
 
 config IMX_CONFIG

diff --git a/board/freescale/imxrt1050-evk/Kconfig b/board/freescale/imxrt1050-evk/Kconfig
index 79e6e45..068130b 100644 (file)
--- a/board/freescale/imxrt1050-evk/Kconfig
+++ b/board/freescale/imxrt1050-evk/Kconfig
@@ -13,7 +13,6 @@ config SYS_SOC
        default "imxrt1050"
 
 config SYS_CONFIG_NAME
-       string
        default "imxrt1050-evk"
 
 config IMX_CONFIG

diff --git a/board/freescale/imxrt1170-evk/Kconfig b/board/freescale/imxrt1170-evk/Kconfig
index c61fc57..b433d6e 100644 (file)
--- a/board/freescale/imxrt1170-evk/Kconfig
+++ b/board/freescale/imxrt1170-evk/Kconfig
@@ -13,7 +13,6 @@ config SYS_SOC
        default "imxrt1170"
 
 config SYS_CONFIG_NAME
-       string
        default "imxrt1170-evk"
 
 config IMX_CONFIG

diff --git a/board/kontron/sl-mx6ul/Kconfig b/board/kontron/sl-mx6ul/Kconfig
index 4e58de2..782e099 100644 (file)
--- a/board/kontron/sl-mx6ul/Kconfig
+++ b/board/kontron/sl-mx6ul/Kconfig
@@ -9,7 +9,6 @@ config SYS_VENDOR
        default "kontron"
 
 config SYS_CONFIG_NAME
-       string
        default "kontron-sl-mx6ul"
 
 endif

diff --git a/board/kontron/sl-mx8mm/Kconfig b/board/kontron/sl-mx8mm/Kconfig
index 9dcf407..1cfe9ee 100644 (file)
--- a/board/kontron/sl-mx8mm/Kconfig
+++ b/board/kontron/sl-mx8mm/Kconfig
@@ -9,7 +9,6 @@ config SYS_VENDOR
        default "kontron"
 
 config SYS_CONFIG_NAME
-       string
        default "kontron-sl-mx8mm"
 
 endif

diff --git a/board/samsung/starqltechn/Kconfig b/board/samsung/starqltechn/Kconfig
index 0eea666..e928cb0 100644 (file)
--- a/board/samsung/starqltechn/Kconfig
+++ b/board/samsung/starqltechn/Kconfig
@@ -6,17 +6,9 @@ config SYS_BOARD
          starqltechn is a production board for S9 and S9+ phones(SM-G96x0) phones based on SDM845 SoC.
 
 config SYS_CONFIG_NAME
-       string "Board configuration name"
        default "sdm845"
-       help
-         This option contains information about board configuration name.
-         Based on this option include/configs/<CONFIG_SYS_CONFIG_NAME>.h header
-         will be used for board configuration.
 
 config SYS_VENDOR
        default "samsung"
 
-config SYS_CONFIG_NAME
-       default "starqltechn"
-
 endif

diff --git a/board/sielaff/imx6dl-sielaff/Kconfig b/board/sielaff/imx6dl-sielaff/Kconfig
index 1b74a7d..7876ab1 100644 (file)
--- a/board/sielaff/imx6dl-sielaff/Kconfig
+++ b/board/sielaff/imx6dl-sielaff/Kconfig
@@ -9,7 +9,6 @@ config SYS_VENDOR
        default "sielaff"
 
 config SYS_CONFIG_NAME
-       string
        default "imx6dl-sielaff"
 
 endif

diff --git a/board/st/stih410-b2260/Kconfig b/board/st/stih410-b2260/Kconfig
index 590add0..441a83c 100644 (file)
--- a/board/st/stih410-b2260/Kconfig
+++ b/board/st/stih410-b2260/Kconfig
@@ -13,7 +13,6 @@ config SYS_SOC
        default "stih410"
 
 config SYS_CONFIG_NAME
-       string
        default "stih410-b2260"
 
 endif

diff --git a/board/st/stm32f429-discovery/Kconfig b/board/st/stm32f429-discovery/Kconfig
index e73d11b..3c93df2 100644 (file)
--- a/board/st/stm32f429-discovery/Kconfig
+++ b/board/st/stm32f429-discovery/Kconfig
@@ -13,7 +13,6 @@ config SYS_SOC
        default "stm32f4"
 
 config SYS_CONFIG_NAME
-       string
        default "stm32f429-discovery"
 
 endif

diff --git a/board/st/stm32f429-evaluation/Kconfig b/board/st/stm32f429-evaluation/Kconfig
index ca4bb3d..eaa40db 100644 (file)
--- a/board/st/stm32f429-evaluation/Kconfig
+++ b/board/st/stm32f429-evaluation/Kconfig
@@ -13,7 +13,6 @@ config SYS_SOC
        default "stm32f4"
 
 config SYS_CONFIG_NAME
-       string
        default "stm32f429-evaluation"
 
 endif

diff --git a/board/st/stm32f469-discovery/Kconfig b/board/st/stm32f469-discovery/Kconfig
index de61b6f..622a8d8 100644 (file)
--- a/board/st/stm32f469-discovery/Kconfig
+++ b/board/st/stm32f469-discovery/Kconfig
@@ -13,7 +13,6 @@ config SYS_SOC
        default "stm32f4"
 
 config SYS_CONFIG_NAME
-       string
        default "stm32f469-discovery"
 
 endif

diff --git a/board/st/stm32f746-disco/Kconfig b/board/st/stm32f746-disco/Kconfig
index 09289d2..86ace17 100644 (file)
--- a/board/st/stm32f746-disco/Kconfig
+++ b/board/st/stm32f746-disco/Kconfig
@@ -13,7 +13,6 @@ config SYS_SOC
        default "stm32f7"
 
 config SYS_CONFIG_NAME
-       string
        default "stm32f746-disco"
 
 endif

diff --git a/board/st/stm32h743-disco/Kconfig b/board/st/stm32h743-disco/Kconfig
index 7d6ec1d..bc116bc 100644 (file)
--- a/board/st/stm32h743-disco/Kconfig
+++ b/board/st/stm32h743-disco/Kconfig
@@ -13,7 +13,6 @@ config SYS_SOC
        default "stm32h7"
 
 config SYS_CONFIG_NAME
-       string
        default "stm32h743-disco"
 
 endif

diff --git a/board/st/stm32h743-eval/Kconfig b/board/st/stm32h743-eval/Kconfig
index ea879b1..ff86de2 100644 (file)
--- a/board/st/stm32h743-eval/Kconfig
+++ b/board/st/stm32h743-eval/Kconfig
@@ -13,7 +13,6 @@ config SYS_SOC
        default "stm32h7"
 
 config SYS_CONFIG_NAME
-       string
        default "stm32h743-eval"
 
 endif

diff --git a/board/st/stm32h750-art-pi/Kconfig b/board/st/stm32h750-art-pi/Kconfig
index c31b984..ab2d0f2 100644 (file)
--- a/board/st/stm32h750-art-pi/Kconfig
+++ b/board/st/stm32h750-art-pi/Kconfig
@@ -13,7 +13,6 @@ config SYS_SOC
        default "stm32h7"
 
 config SYS_CONFIG_NAME
-       string
        default "stm32h750-art-pi"
 
 endif

diff --git a/board/sysam/amcore/Kconfig b/board/sysam/amcore/Kconfig
index dd9816e..e13ee8f 100644 (file)
--- a/board/sysam/amcore/Kconfig
+++ b/board/sysam/amcore/Kconfig
@@ -13,7 +13,6 @@ config SYS_VENDOR
         default "sysam"
 
 config SYS_CONFIG_NAME
-        string
         default "amcore"
 
 endif

diff --git a/board/xilinx/microblaze-generic/Kconfig b/board/xilinx/microblaze-generic/Kconfig
index dd5eace..038ff0b 100644 (file)
--- a/board/xilinx/microblaze-generic/Kconfig
+++ b/board/xilinx/microblaze-generic/Kconfig
@@ -6,14 +6,6 @@ config SYS_BOARD
 config SYS_VENDOR
        default "xilinx"
 
-config SYS_CONFIG_NAME
-       string "Board configuration name"
-       default "microblaze-generic"
-       help
-         This option contains information about board configuration name.
-         Based on this option include/configs/<CONFIG_SYS_CONFIG_NAME>.h header
-         will be used for board configuration.
-
 config XILINX_MICROBLAZE0_USE_MSR_INSTR
        int "USE_MSR_INSTR range (0:1)"
        default 0