mirror of
https://github.com/u-boot/u-boot.git
synced 2025-04-19 03:15:00 +00:00
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>
This commit is contained in:
parent
770afff24a
commit
3dd1486800
33 changed files with 10 additions and 100 deletions
11
arch/Kconfig
11
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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -9,7 +9,6 @@ config SYS_VENDOR
|
|||
default "Marvell"
|
||||
|
||||
config SYS_CONFIG_NAME
|
||||
string
|
||||
default "octeon_ebb7304"
|
||||
|
||||
config DEFAULT_DEVICE_TREE
|
||||
|
|
|
@ -9,7 +9,6 @@ config SYS_VENDOR
|
|||
default "Marvell"
|
||||
|
||||
config SYS_CONFIG_NAME
|
||||
string
|
||||
default "octeon_nic23"
|
||||
|
||||
config DEFAULT_DEVICE_TREE
|
||||
|
|
|
@ -25,7 +25,6 @@ config SYS_VENDOR
|
|||
default "cadence"
|
||||
|
||||
config SYS_CONFIG_NAME
|
||||
string
|
||||
default "xtfpga"
|
||||
|
||||
config BOARD_SDRAM_SIZE
|
||||
|
|
|
@ -13,7 +13,6 @@ config SYS_VENDOR
|
|||
default "cavium"
|
||||
|
||||
config SYS_CONFIG_NAME
|
||||
string
|
||||
default "thunderx_88xx"
|
||||
|
||||
config CMD_ATF
|
||||
|
|
|
@ -13,7 +13,6 @@ config SYS_SOC
|
|||
default "imxrt1020"
|
||||
|
||||
config SYS_CONFIG_NAME
|
||||
string
|
||||
default "imxrt1020-evk"
|
||||
|
||||
config IMX_CONFIG
|
||||
|
|
|
@ -13,7 +13,6 @@ config SYS_SOC
|
|||
default "imxrt1050"
|
||||
|
||||
config SYS_CONFIG_NAME
|
||||
string
|
||||
default "imxrt1050-evk"
|
||||
|
||||
config IMX_CONFIG
|
||||
|
|
|
@ -13,7 +13,6 @@ config SYS_SOC
|
|||
default "imxrt1170"
|
||||
|
||||
config SYS_CONFIG_NAME
|
||||
string
|
||||
default "imxrt1170-evk"
|
||||
|
||||
config IMX_CONFIG
|
||||
|
|
|
@ -9,7 +9,6 @@ config SYS_VENDOR
|
|||
default "kontron"
|
||||
|
||||
config SYS_CONFIG_NAME
|
||||
string
|
||||
default "kontron-sl-mx6ul"
|
||||
|
||||
endif
|
||||
|
|
|
@ -9,7 +9,6 @@ config SYS_VENDOR
|
|||
default "kontron"
|
||||
|
||||
config SYS_CONFIG_NAME
|
||||
string
|
||||
default "kontron-sl-mx8mm"
|
||||
|
||||
endif
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -9,7 +9,6 @@ config SYS_VENDOR
|
|||
default "sielaff"
|
||||
|
||||
config SYS_CONFIG_NAME
|
||||
string
|
||||
default "imx6dl-sielaff"
|
||||
|
||||
endif
|
||||
|
|
|
@ -13,7 +13,6 @@ config SYS_SOC
|
|||
default "stih410"
|
||||
|
||||
config SYS_CONFIG_NAME
|
||||
string
|
||||
default "stih410-b2260"
|
||||
|
||||
endif
|
||||
|
|
|
@ -13,7 +13,6 @@ config SYS_SOC
|
|||
default "stm32f4"
|
||||
|
||||
config SYS_CONFIG_NAME
|
||||
string
|
||||
default "stm32f429-discovery"
|
||||
|
||||
endif
|
||||
|
|
|
@ -13,7 +13,6 @@ config SYS_SOC
|
|||
default "stm32f4"
|
||||
|
||||
config SYS_CONFIG_NAME
|
||||
string
|
||||
default "stm32f429-evaluation"
|
||||
|
||||
endif
|
||||
|
|
|
@ -13,7 +13,6 @@ config SYS_SOC
|
|||
default "stm32f4"
|
||||
|
||||
config SYS_CONFIG_NAME
|
||||
string
|
||||
default "stm32f469-discovery"
|
||||
|
||||
endif
|
||||
|
|
|
@ -13,7 +13,6 @@ config SYS_SOC
|
|||
default "stm32f7"
|
||||
|
||||
config SYS_CONFIG_NAME
|
||||
string
|
||||
default "stm32f746-disco"
|
||||
|
||||
endif
|
||||
|
|
|
@ -13,7 +13,6 @@ config SYS_SOC
|
|||
default "stm32h7"
|
||||
|
||||
config SYS_CONFIG_NAME
|
||||
string
|
||||
default "stm32h743-disco"
|
||||
|
||||
endif
|
||||
|
|
|
@ -13,7 +13,6 @@ config SYS_SOC
|
|||
default "stm32h7"
|
||||
|
||||
config SYS_CONFIG_NAME
|
||||
string
|
||||
default "stm32h743-eval"
|
||||
|
||||
endif
|
||||
|
|
|
@ -13,7 +13,6 @@ config SYS_SOC
|
|||
default "stm32h7"
|
||||
|
||||
config SYS_CONFIG_NAME
|
||||
string
|
||||
default "stm32h750-art-pi"
|
||||
|
||||
endif
|
||||
|
|
|
@ -13,7 +13,6 @@ config SYS_VENDOR
|
|||
default "sysam"
|
||||
|
||||
config SYS_CONFIG_NAME
|
||||
string
|
||||
default "amcore"
|
||||
|
||||
endif
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue