Merge patch series "kbuild: Allow for CONFIG_SYS_CONFIG_NAME to be unset"

Perform a little re-organization of Kconfig so that we can have
CONFIG_SYS_CONFIG_NAME be unset and so not require a "board.h" file.
Then go and remove a number of now not required header files.
This commit is contained in:
Tom Rini
2024-02-27 14:18:55 -05:00
76 changed files with 11 additions and 223 deletions
+10 -1
View File
@@ -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
-6
View File
@@ -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
-8
View File
@@ -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
-8
View File
@@ -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
-8
View File
@@ -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
-8
View File
@@ -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
-8
View File
@@ -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
-8
View File
@@ -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
-1
View File
@@ -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
-1
View File
@@ -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
-1
View File
@@ -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"
-7
View File
@@ -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
-1
View File
@@ -9,7 +9,6 @@ config SYS_VENDOR
default "Marvell"
config SYS_CONFIG_NAME
string
default "octeon_ebb7304"
config DEFAULT_DEVICE_TREE
-1
View File
@@ -9,7 +9,6 @@ config SYS_VENDOR
default "Marvell"
config SYS_CONFIG_NAME
string
default "octeon_nic23"
config DEFAULT_DEVICE_TREE
-1
View File
@@ -25,7 +25,6 @@ config SYS_VENDOR
default "cadence"
config SYS_CONFIG_NAME
string
default "xtfpga"
config BOARD_SDRAM_SIZE
-1
View File
@@ -13,7 +13,6 @@ config SYS_VENDOR
default "cavium"
config SYS_CONFIG_NAME
string
default "thunderx_88xx"
config CMD_ATF
-7
View File
@@ -29,10 +29,3 @@ config SYS_CAR_SIZE
This option specifies the board specific Cache-As-RAM (CAR) size.
endif # CONFIG_VENDOR_COREBOOT
if TARGET_COREBOOT
config SYS_CONFIG_NAME
default "coreboot"
endif
-1
View File
@@ -2,7 +2,6 @@ COREBOOT BOARD
M: Simon Glass <sjg@chromium.org>
S: Maintained
F: board/coreboot/
F: include/configs/coreboot.h
F: configs/coreboot_defconfig
COREBOOT64 BOARD
-3
View File
@@ -9,9 +9,6 @@ config SYS_VENDOR
config SYS_SOC
default "efi"
config SYS_CONFIG_NAME
default "efi-x86_app"
config BOARD_SPECIFIC_OPTIONS # dummy
def_bool y
imply VIDEO_EFI
-2
View File
@@ -3,7 +3,6 @@ M: Simon Glass <sjg@chromium.org>
S: Maintained
F: board/efi/Kconfig
F: board/efi/efi-x86_app/
F: include/configs/efi-x86_app.h
F: configs/efi-x86_app32_defconfig
EFI-X86_APP64 BOARD
@@ -11,5 +10,4 @@ M: Simon Glass <sjg@chromium.org>
S: Maintained
F: board/efi/Kconfig
F: board/efi/efi-x86_app/
F: include/configs/efi-x86_app.h
F: configs/efi-x86_app64_defconfig
-3
View File
@@ -9,9 +9,6 @@ config SYS_VENDOR
config SYS_SOC
default "efi"
config SYS_CONFIG_NAME
default "efi-x86_payload"
config TEXT_BASE
default 0x00200000
-1
View File
@@ -3,6 +3,5 @@ M: Bin Meng <bmeng.cn@gmail.com>
S: Maintained
F: board/efi/Kconfig
F: board/efi/efi-x86_payload/
F: include/configs/efi-x86_payload.h
F: configs/efi-x86_payload32_defconfig
F: configs/efi-x86_payload64_defconfig
-3
View File
@@ -9,9 +9,6 @@ config SYS_VENDOR
config SYS_SOC
default "qemu"
config SYS_CONFIG_NAME
default "qemu-x86"
config TEXT_BASE
default 0xfff00000 if !SUPPORT_SPL
default 0x01110000 if SUPPORT_SPL
-2
View File
@@ -3,7 +3,6 @@ M: Bin Meng <bmeng.cn@gmail.com>
S: Maintained
F: board/emulation/qemu-x86/
F: board/emulation/common/
F: include/configs/qemu-x86.h
F: configs/qemu-x86_defconfig
QEMU X86 64-bit BOARD
@@ -11,5 +10,4 @@ M: Bin Meng <bmeng.cn@gmail.com>
S: Maintained
F: board/emulation/qemu-x86/
F: board/emulation/common/
F: include/configs/qemu-x86.h
F: configs/qemu-x86_64_defconfig
-1
View File
@@ -13,7 +13,6 @@ config SYS_SOC
default "imxrt1020"
config SYS_CONFIG_NAME
string
default "imxrt1020-evk"
config IMX_CONFIG
-1
View File
@@ -13,7 +13,6 @@ config SYS_SOC
default "imxrt1050"
config SYS_CONFIG_NAME
string
default "imxrt1050-evk"
config IMX_CONFIG
-1
View File
@@ -13,7 +13,6 @@ config SYS_SOC
default "imxrt1170"
config SYS_CONFIG_NAME
string
default "imxrt1170-evk"
config IMX_CONFIG
-3
View File
@@ -9,9 +9,6 @@ config SYS_VENDOR
config SYS_SOC
default "baytrail"
config SYS_CONFIG_NAME
default "bayleybay"
config TEXT_BASE
default 0xfff00000
-1
View File
@@ -2,5 +2,4 @@ Intel Bayley Bay
M: Bin Meng <bmeng.cn@gmail.com>
S: Maintained
F: board/intel/bayleybay
F: include/configs/bayleybay.h
F: configs/bayleybay_defconfig
-3
View File
@@ -9,9 +9,6 @@ config SYS_VENDOR
config SYS_SOC
default "braswell"
config SYS_CONFIG_NAME
default "cherryhill"
config TEXT_BASE
default 0xffe00000
-1
View File
@@ -2,5 +2,4 @@ INTEL CHERRYHILL BOARD
M: Bin Meng <bmeng.cn@gmail.com>
S: Maintained
F: board/intel/cherryhill/
F: include/configs/cherryhill.h
F: configs/cherryhill_defconfig
-3
View File
@@ -9,9 +9,6 @@ config SYS_VENDOR
config SYS_SOC
default "ivybridge"
config SYS_CONFIG_NAME
default "cougarcanyon2"
config TEXT_BASE
default 0xffe00000
-1
View File
@@ -2,5 +2,4 @@ INTEL COUGAR CANYON 2 BOARD
M: Bin Meng <bmeng.cn@gmail.com>
S: Maintained
F: board/intel/cougarcanyon2/
F: include/configs/cougarcanyon2.h
F: configs/cougarcanyon2_defconfig
-3
View File
@@ -9,9 +9,6 @@ config SYS_VENDOR
config SYS_SOC
default "queensbay"
config SYS_CONFIG_NAME
default "crownbay"
config TEXT_BASE
default 0xfff00000
-1
View File
@@ -2,5 +2,4 @@ INTEL CROWNBAY BOARD
M: Bin Meng <bmeng.cn@gmail.com>
S: Maintained
F: board/intel/crownbay/
F: include/configs/crownbay.h
F: configs/crownbay_defconfig
-3
View File
@@ -9,9 +9,6 @@ config SYS_VENDOR
config SYS_SOC
default "tangier"
config SYS_CONFIG_NAME
default "edison"
config SYS_MALLOC_LEN
default 0x08000000
-1
View File
@@ -2,5 +2,4 @@ Intel Edison Board
M: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
S: Maintained
F: board/intel/edison
F: include/configs/edison.h
F: configs/edison_defconfig
-3
View File
@@ -9,9 +9,6 @@ config SYS_VENDOR
config SYS_SOC
default "quark"
config SYS_CONFIG_NAME
default "galileo"
config TEXT_BASE
default 0xfff10000
-1
View File
@@ -2,5 +2,4 @@ INTEL GALILEO BOARD
M: Bin Meng <bmeng.cn@gmail.com>
S: Maintained
F: board/intel/galileo/
F: include/configs/galileo.h
F: configs/galileo_defconfig
-3
View File
@@ -9,9 +9,6 @@ config SYS_VENDOR
config SYS_SOC
default "baytrail"
config SYS_CONFIG_NAME
default "minnowmax"
config TEXT_BASE
default 0xfff00000
-1
View File
@@ -2,5 +2,4 @@ CircuitCo Minnowboard Max
M: Simon Glass <sjg@chromium.org>
S: Maintained
F: board/intel/minnowmax
F: include/configs/minnowmax.h
F: configs/minnowmax_defconfig
-3
View File
@@ -13,9 +13,6 @@ config SYS_VENDOR
config SYS_SOC
default "slimbootloader"
config SYS_CONFIG_NAME
default "slimbootloader"
config TEXT_BASE
default 0x00100000
-1
View File
@@ -2,5 +2,4 @@ Intel Slim Bootloader Payload
M: Aiden Park <aiden.park@intel.com>
S: Maintained
F: board/intel/slimbootloader
F: include/configs/slimbootloader.h
F: configs/slimbootloader_defconfig
-1
View File
@@ -9,7 +9,6 @@ config SYS_VENDOR
default "kontron"
config SYS_CONFIG_NAME
string
default "kontron-sl-mx6ul"
endif
-1
View File
@@ -9,7 +9,6 @@ config SYS_VENDOR
default "kontron"
config SYS_CONFIG_NAME
string
default "kontron-sl-mx8mm"
endif
-8
View File
@@ -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
-1
View File
@@ -9,7 +9,6 @@ config SYS_VENDOR
default "sielaff"
config SYS_CONFIG_NAME
string
default "imx6dl-sielaff"
endif
-3
View File
@@ -9,7 +9,4 @@ config SYS_VENDOR
config SYS_SOC
default "hi3798mv200"
config SYS_CONFIG_NAME
default "hc2910-2aghd05"
endif
@@ -2,5 +2,4 @@ HC2910 2AGHD05 BOARD
M: Yang Xiwen <firbidden405@outlook.com>
S: Maintained
F: board/skyworth/hc2910-2aghd05
F: include/configs/hc2910-2aghd05.h
F: configs/hc2910_2aghd05_defconfig
-1
View File
@@ -13,7 +13,6 @@ config SYS_SOC
default "stih410"
config SYS_CONFIG_NAME
string
default "stih410-b2260"
endif
-1
View File
@@ -13,7 +13,6 @@ config SYS_SOC
default "stm32f4"
config SYS_CONFIG_NAME
string
default "stm32f429-discovery"
endif
-1
View File
@@ -13,7 +13,6 @@ config SYS_SOC
default "stm32f4"
config SYS_CONFIG_NAME
string
default "stm32f429-evaluation"
endif
-1
View File
@@ -13,7 +13,6 @@ config SYS_SOC
default "stm32f4"
config SYS_CONFIG_NAME
string
default "stm32f469-discovery"
endif
-1
View File
@@ -13,7 +13,6 @@ config SYS_SOC
default "stm32f7"
config SYS_CONFIG_NAME
string
default "stm32f746-disco"
endif
-1
View File
@@ -13,7 +13,6 @@ config SYS_SOC
default "stm32h7"
config SYS_CONFIG_NAME
string
default "stm32h743-disco"
endif
-1
View File
@@ -13,7 +13,6 @@ config SYS_SOC
default "stm32h7"
config SYS_CONFIG_NAME
string
default "stm32h743-eval"
endif
-1
View File
@@ -13,7 +13,6 @@ config SYS_SOC
default "stm32h7"
config SYS_CONFIG_NAME
string
default "stm32h750-art-pi"
endif
-1
View File
@@ -13,7 +13,6 @@ config SYS_VENDOR
default "sysam"
config SYS_CONFIG_NAME
string
default "amcore"
endif
-3
View File
@@ -9,9 +9,6 @@ config SYS_VENDOR
config SYS_CPU
default "generic"
config SYS_CONFIG_NAME
default "xilinx_mbv"
config TEXT_BASE
default 0x80000000 if !RISCV_SMODE
default 0x80400000 if RISCV_SMODE && ARCH_RV32I
-1
View File
@@ -4,4 +4,3 @@ S: Maintained
F: arch/riscv/dts/xilinx-mbv*
F: board/xilinx/mbv/
F: configs/xilinx_mbv*
F: include/configs/xilinx_mbv.h
-8
View File
@@ -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
-4
View File
@@ -1,4 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com>
*/
-4
View File
@@ -1,4 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017, Bin Meng <bmeng.cn@gmail.com>
*/
-4
View File
@@ -1,4 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2018, Bin Meng <bmeng.cn@gmail.com>
*/
-4
View File
@@ -1,4 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2016, Bin Meng <bmeng.cn@gmail.com>
*/
-4
View File
@@ -1,4 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2014, Bin Meng <bmeng.cn@gmail.com>
*/
-4
View File
@@ -1,4 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2017 Intel Corp.
*/
-4
View File
@@ -1,4 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2015 Google, Inc
*/
-4
View File
@@ -1,4 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2018, Bin Meng <bmeng.cn@gmail.com>
*/
-4
View File
@@ -1,4 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com>
*/
-6
View File
@@ -1,6 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0+ */
#ifndef __HC2910_2AGHD05_CONFIG_H__
#define __HC2910_2AGHD05_CONFIG_H__
#endif
-4
View File
@@ -1,4 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015 Google, Inc
*/
-4
View File
@@ -1,4 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com>
*/
-4
View File
@@ -1,4 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2019 Intel Corporation <www.intel.com>
*/
-6
View File
@@ -1,6 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0 */
/*
* (C) Copyright 2023, Advanced Micro Devices, Inc.
*
* Michal Simek <michal.simek@amd.com>
*/
+1 -1
View File
@@ -113,7 +113,7 @@ vpl/include/autoconf.mk: vpl/u-boot.cfg
define filechk_config_h
(echo "/* Automatically generated - do not edit */"; \
echo \#define CFG_BOARDDIR board/$(if $(VENDOR),$(VENDOR)/)$(BOARD);\
echo \#include \<configs/$(CONFIG_SYS_CONFIG_NAME).h\>; \
$(if $(CONFIG_SYS_CONFIG_NAME),echo \#include \<configs/$(CONFIG_SYS_CONFIG_NAME).h\> ;) \
echo \#include \<asm/config.h\>; \
echo \#include \<linux/kconfig.h\>; \
echo \#include \<config_fallbacks.h\>;)