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
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -361,7 +361,16 @@
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
--- a/arch/arm/mach-mediatek/Kconfig
+++ b/arch/arm/mach-mediatek/Kconfig
@@ -133,7 +133,6 @@
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 @@
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
--- a/arch/arm/mach-meson/Kconfig
+++ b/arch/arm/mach-meson/Kconfig
@@ -88,12 +88,4 @@
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
--- a/arch/arm/mach-versal-net/Kconfig
+++ b/arch/arm/mach-versal-net/Kconfig
@@ -13,14 +13,6 @@
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
--- a/arch/arm/mach-versal/Kconfig
+++ b/arch/arm/mach-versal/Kconfig
@@ -13,14 +13,6 @@
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
--- a/arch/arm/mach-zynq/Kconfig
+++ b/arch/arm/mach-zynq/Kconfig
@@ -43,14 +43,6 @@
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
--- a/arch/arm/mach-zynqmp-r5/Kconfig
+++ b/arch/arm/mach-zynqmp-r5/Kconfig
@@ -13,14 +13,6 @@
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
--- a/arch/arm/mach-zynqmp/Kconfig
+++ b/arch/arm/mach-zynqmp/Kconfig
@@ -35,14 +35,6 @@
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
--- a/arch/mips/mach-mtmips/mt7620/Kconfig
+++ b/arch/mips/mach-mtmips/mt7620/Kconfig
@@ -67,7 +67,6 @@
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
--- a/arch/mips/mach-mtmips/mt7621/Kconfig
+++ b/arch/mips/mach-mtmips/mt7621/Kconfig
@@ -102,7 +102,6 @@
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
--- a/arch/mips/mach-mtmips/mt7628/Kconfig
+++ b/arch/mips/mach-mtmips/mt7628/Kconfig
@@ -49,7 +49,6 @@
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
--- a/arch/nios2/Kconfig
+++ b/arch/nios2/Kconfig
@@ -4,11 +4,4 @@
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