From bcd8bce57c6d3ac7b52feb021cdf18bfc359104b Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 22 Jan 2024 17:39:05 -0500 Subject: kbuild: Allow for CONFIG_SYS_CONFIG_NAME to be unset It is possible to have a platform which does not require a board.h file to build, but today we need an empty one for our generated config.h file to be valid. Allow for omitting this file if CONFIG_SYS_CONFIG_NAME is not set. Signed-off-by: Tom Rini --- scripts/Makefile.autoconf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/Makefile.autoconf b/scripts/Makefile.autoconf index 0ade91642ae..8208ffe2274 100644 --- a/scripts/Makefile.autoconf +++ b/scripts/Makefile.autoconf @@ -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 \; \ + $(if $(CONFIG_SYS_CONFIG_NAME),echo \#include \ ;) \ echo \#include \; \ echo \#include \; \ echo \#include \;) -- cgit v1.3.1 From e82f7c627cd0bee334273541fa41b26eb9a9ab8a Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 22 Jan 2024 17:39:06 -0500 Subject: xilinx_mbv: Remove empty config header Now that we support having CONFIG_SYS_CONFIG_NAME be unset to indicate a lack of board.h file, unset this on the xilinx_mbv platforms and remove the otherwise empty file. Acked-by: Michal Simek Signed-off-by: Tom Rini --- board/xilinx/mbv/Kconfig | 3 --- board/xilinx/mbv/MAINTAINERS | 1 - include/configs/xilinx_mbv.h | 6 ------ 3 files changed, 10 deletions(-) delete mode 100644 include/configs/xilinx_mbv.h diff --git a/board/xilinx/mbv/Kconfig b/board/xilinx/mbv/Kconfig index 4bc9f72c541..d2dec397ed6 100644 --- a/board/xilinx/mbv/Kconfig +++ b/board/xilinx/mbv/Kconfig @@ -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 diff --git a/board/xilinx/mbv/MAINTAINERS b/board/xilinx/mbv/MAINTAINERS index 445654fe740..db9f03388df 100644 --- a/board/xilinx/mbv/MAINTAINERS +++ b/board/xilinx/mbv/MAINTAINERS @@ -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 diff --git a/include/configs/xilinx_mbv.h b/include/configs/xilinx_mbv.h deleted file mode 100644 index dba398aeec4..00000000000 --- a/include/configs/xilinx_mbv.h +++ /dev/null @@ -1,6 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* - * (C) Copyright 2023, Advanced Micro Devices, Inc. - * - * Michal Simek - */ -- cgit v1.3.1 From abb23315c06e8c5241c35fc89fe9c9a0756dc5f7 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 22 Jan 2024 17:39:07 -0500 Subject: coreboot: Remove empty config header Now that we support having CONFIG_SYS_CONFIG_NAME be unset to indicate a lack of board.h file, unset this on the coreboot platform and remove the otherwise empty file. Signed-off-by: Tom Rini --- board/coreboot/coreboot/Kconfig | 7 ------- board/coreboot/coreboot/MAINTAINERS | 1 - include/configs/coreboot.h | 4 ---- 3 files changed, 12 deletions(-) delete mode 100644 include/configs/coreboot.h diff --git a/board/coreboot/coreboot/Kconfig b/board/coreboot/coreboot/Kconfig index 4f41ce1abf1..abbf08ac695 100644 --- a/board/coreboot/coreboot/Kconfig +++ b/board/coreboot/coreboot/Kconfig @@ -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 diff --git a/board/coreboot/coreboot/MAINTAINERS b/board/coreboot/coreboot/MAINTAINERS index f7773658000..d97383c030c 100644 --- a/board/coreboot/coreboot/MAINTAINERS +++ b/board/coreboot/coreboot/MAINTAINERS @@ -2,7 +2,6 @@ COREBOOT BOARD M: Simon Glass S: Maintained F: board/coreboot/ -F: include/configs/coreboot.h F: configs/coreboot_defconfig COREBOOT64 BOARD diff --git a/include/configs/coreboot.h b/include/configs/coreboot.h deleted file mode 100644 index e00c408f29a..00000000000 --- a/include/configs/coreboot.h +++ /dev/null @@ -1,4 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright (C) 2018, Bin Meng - */ -- cgit v1.3.1 From 3cf2d25ecb41f0b0f1e7e0aa429ad2c8c8f9a38f Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 22 Jan 2024 17:39:08 -0500 Subject: bayleybay: Remove empty config header Now that we support having CONFIG_SYS_CONFIG_NAME be unset to indicate a lack of board.h file, unset this on the bayleybay platform and remove the otherwise empty file. Signed-off-by: Tom Rini --- board/intel/bayleybay/Kconfig | 3 --- board/intel/bayleybay/MAINTAINERS | 1 - include/configs/bayleybay.h | 4 ---- 3 files changed, 8 deletions(-) delete mode 100644 include/configs/bayleybay.h diff --git a/board/intel/bayleybay/Kconfig b/board/intel/bayleybay/Kconfig index 97228d63087..af08566014d 100644 --- a/board/intel/bayleybay/Kconfig +++ b/board/intel/bayleybay/Kconfig @@ -9,9 +9,6 @@ config SYS_VENDOR config SYS_SOC default "baytrail" -config SYS_CONFIG_NAME - default "bayleybay" - config TEXT_BASE default 0xfff00000 diff --git a/board/intel/bayleybay/MAINTAINERS b/board/intel/bayleybay/MAINTAINERS index 85fa51626af..5ab5d73f59e 100644 --- a/board/intel/bayleybay/MAINTAINERS +++ b/board/intel/bayleybay/MAINTAINERS @@ -2,5 +2,4 @@ Intel Bayley Bay M: Bin Meng S: Maintained F: board/intel/bayleybay -F: include/configs/bayleybay.h F: configs/bayleybay_defconfig diff --git a/include/configs/bayleybay.h b/include/configs/bayleybay.h deleted file mode 100644 index 9b0f5cedcd7..00000000000 --- a/include/configs/bayleybay.h +++ /dev/null @@ -1,4 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright (C) 2015, Bin Meng - */ -- cgit v1.3.1 From 063bf17d1e76ee9c9b28d2a1e695ad4d8202f359 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 22 Jan 2024 17:39:09 -0500 Subject: cherryhill: Remove empty config header Now that we support having CONFIG_SYS_CONFIG_NAME be unset to indicate a lack of board.h file, unset this on the cherryhill platform and remove the otherwise empty file. Signed-off-by: Tom Rini --- board/intel/cherryhill/Kconfig | 3 --- board/intel/cherryhill/MAINTAINERS | 1 - include/configs/cherryhill.h | 4 ---- 3 files changed, 8 deletions(-) delete mode 100644 include/configs/cherryhill.h diff --git a/board/intel/cherryhill/Kconfig b/board/intel/cherryhill/Kconfig index 009cd93b6d4..28e4735e4d6 100644 --- a/board/intel/cherryhill/Kconfig +++ b/board/intel/cherryhill/Kconfig @@ -9,9 +9,6 @@ config SYS_VENDOR config SYS_SOC default "braswell" -config SYS_CONFIG_NAME - default "cherryhill" - config TEXT_BASE default 0xffe00000 diff --git a/board/intel/cherryhill/MAINTAINERS b/board/intel/cherryhill/MAINTAINERS index 6e90f642125..7c1b311990c 100644 --- a/board/intel/cherryhill/MAINTAINERS +++ b/board/intel/cherryhill/MAINTAINERS @@ -2,5 +2,4 @@ INTEL CHERRYHILL BOARD M: Bin Meng S: Maintained F: board/intel/cherryhill/ -F: include/configs/cherryhill.h F: configs/cherryhill_defconfig diff --git a/include/configs/cherryhill.h b/include/configs/cherryhill.h deleted file mode 100644 index a3009571de9..00000000000 --- a/include/configs/cherryhill.h +++ /dev/null @@ -1,4 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright (C) 2017, Bin Meng - */ -- cgit v1.3.1 From 1ef8524c3e78a3aec74479220c27bfebcb62ec98 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 22 Jan 2024 17:39:10 -0500 Subject: cougarcanyon2: Remove empty config header Now that we support having CONFIG_SYS_CONFIG_NAME be unset to indicate a lack of board.h file, unset this on the cougarcanyon2 platform and remove the otherwise empty file. Signed-off-by: Tom Rini --- board/intel/cougarcanyon2/Kconfig | 3 --- board/intel/cougarcanyon2/MAINTAINERS | 1 - include/configs/cougarcanyon2.h | 4 ---- 3 files changed, 8 deletions(-) delete mode 100644 include/configs/cougarcanyon2.h diff --git a/board/intel/cougarcanyon2/Kconfig b/board/intel/cougarcanyon2/Kconfig index 32407025bc1..841e041167e 100644 --- a/board/intel/cougarcanyon2/Kconfig +++ b/board/intel/cougarcanyon2/Kconfig @@ -9,9 +9,6 @@ config SYS_VENDOR config SYS_SOC default "ivybridge" -config SYS_CONFIG_NAME - default "cougarcanyon2" - config TEXT_BASE default 0xffe00000 diff --git a/board/intel/cougarcanyon2/MAINTAINERS b/board/intel/cougarcanyon2/MAINTAINERS index a486739b5ee..a4f465cf5df 100644 --- a/board/intel/cougarcanyon2/MAINTAINERS +++ b/board/intel/cougarcanyon2/MAINTAINERS @@ -2,5 +2,4 @@ INTEL COUGAR CANYON 2 BOARD M: Bin Meng S: Maintained F: board/intel/cougarcanyon2/ -F: include/configs/cougarcanyon2.h F: configs/cougarcanyon2_defconfig diff --git a/include/configs/cougarcanyon2.h b/include/configs/cougarcanyon2.h deleted file mode 100644 index 0406786f7c6..00000000000 --- a/include/configs/cougarcanyon2.h +++ /dev/null @@ -1,4 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright (C) 2016, Bin Meng - */ -- cgit v1.3.1 From dd4a55965ee4778740a285e1f0f93dcd764065ad Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 22 Jan 2024 17:39:11 -0500 Subject: crownbay: Remove empty config header Now that we support having CONFIG_SYS_CONFIG_NAME be unset to indicate a lack of board.h file, unset this on the crownbay platform and remove the otherwise empty file. Signed-off-by: Tom Rini --- board/intel/crownbay/Kconfig | 3 --- board/intel/crownbay/MAINTAINERS | 1 - include/configs/crownbay.h | 4 ---- 3 files changed, 8 deletions(-) delete mode 100644 include/configs/crownbay.h diff --git a/board/intel/crownbay/Kconfig b/board/intel/crownbay/Kconfig index eb2290cfafb..09614ab8d15 100644 --- a/board/intel/crownbay/Kconfig +++ b/board/intel/crownbay/Kconfig @@ -9,9 +9,6 @@ config SYS_VENDOR config SYS_SOC default "queensbay" -config SYS_CONFIG_NAME - default "crownbay" - config TEXT_BASE default 0xfff00000 diff --git a/board/intel/crownbay/MAINTAINERS b/board/intel/crownbay/MAINTAINERS index 1eb68693df3..e2d8e6bc1d0 100644 --- a/board/intel/crownbay/MAINTAINERS +++ b/board/intel/crownbay/MAINTAINERS @@ -2,5 +2,4 @@ INTEL CROWNBAY BOARD M: Bin Meng S: Maintained F: board/intel/crownbay/ -F: include/configs/crownbay.h F: configs/crownbay_defconfig diff --git a/include/configs/crownbay.h b/include/configs/crownbay.h deleted file mode 100644 index 0c842dd01eb..00000000000 --- a/include/configs/crownbay.h +++ /dev/null @@ -1,4 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright (C) 2014, Bin Meng - */ -- cgit v1.3.1 From 6e8bc6b2594ee082e22c100c2e96b7e7c2de9538 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 22 Jan 2024 17:39:12 -0500 Subject: edison: Remove empty config header Now that we support having CONFIG_SYS_CONFIG_NAME be unset to indicate a lack of board.h file, unset this on the edison platform and remove the otherwise empty file. Acked-by: Andy Shevchenko Signed-off-by: Tom Rini --- board/intel/edison/Kconfig | 3 --- board/intel/edison/MAINTAINERS | 1 - include/configs/edison.h | 4 ---- 3 files changed, 8 deletions(-) delete mode 100644 include/configs/edison.h diff --git a/board/intel/edison/Kconfig b/board/intel/edison/Kconfig index 5efda4b3a55..daa8d2035cd 100644 --- a/board/intel/edison/Kconfig +++ b/board/intel/edison/Kconfig @@ -9,9 +9,6 @@ config SYS_VENDOR config SYS_SOC default "tangier" -config SYS_CONFIG_NAME - default "edison" - config SYS_MALLOC_LEN default 0x08000000 diff --git a/board/intel/edison/MAINTAINERS b/board/intel/edison/MAINTAINERS index 4bc4a00c8ad..26b27c5dfe1 100644 --- a/board/intel/edison/MAINTAINERS +++ b/board/intel/edison/MAINTAINERS @@ -2,5 +2,4 @@ Intel Edison Board M: Andy Shevchenko S: Maintained F: board/intel/edison -F: include/configs/edison.h F: configs/edison_defconfig diff --git a/include/configs/edison.h b/include/configs/edison.h deleted file mode 100644 index 127c2c4546e..00000000000 --- a/include/configs/edison.h +++ /dev/null @@ -1,4 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright (c) 2017 Intel Corp. - */ -- cgit v1.3.1 From f10e484fc555e7b2f4b5d8ec86044f78bb70d4d4 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 22 Jan 2024 17:39:13 -0500 Subject: efi-x86_app: Remove empty config header Now that we support having CONFIG_SYS_CONFIG_NAME be unset to indicate a lack of board.h file, unset this on the efi-x86_app* platforms and remove the otherwise empty file. Signed-off-by: Tom Rini --- board/efi/efi-x86_app/Kconfig | 3 --- board/efi/efi-x86_app/MAINTAINERS | 2 -- include/configs/efi-x86_app.h | 4 ---- 3 files changed, 9 deletions(-) delete mode 100644 include/configs/efi-x86_app.h diff --git a/board/efi/efi-x86_app/Kconfig b/board/efi/efi-x86_app/Kconfig index ecd08d73146..f9cbef0a864 100644 --- a/board/efi/efi-x86_app/Kconfig +++ b/board/efi/efi-x86_app/Kconfig @@ -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 diff --git a/board/efi/efi-x86_app/MAINTAINERS b/board/efi/efi-x86_app/MAINTAINERS index 584619c51df..693f367311b 100644 --- a/board/efi/efi-x86_app/MAINTAINERS +++ b/board/efi/efi-x86_app/MAINTAINERS @@ -3,7 +3,6 @@ M: Simon Glass 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 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 diff --git a/include/configs/efi-x86_app.h b/include/configs/efi-x86_app.h deleted file mode 100644 index d5824049d69..00000000000 --- a/include/configs/efi-x86_app.h +++ /dev/null @@ -1,4 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright (c) 2015 Google, Inc - */ -- cgit v1.3.1 From 93e6e6cc7d11fe9d31d85a2d8b3db68aa8c56e6d Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 22 Jan 2024 17:39:14 -0500 Subject: efi-x86_payload: Remove empty config header Now that we support having CONFIG_SYS_CONFIG_NAME be unset to indicate a lack of board.h file, unset this on the efi-x86_payload* platforms and remove the otherwise empty file. Signed-off-by: Tom Rini --- board/efi/efi-x86_payload/Kconfig | 3 --- board/efi/efi-x86_payload/MAINTAINERS | 1 - include/configs/efi-x86_payload.h | 4 ---- 3 files changed, 8 deletions(-) delete mode 100644 include/configs/efi-x86_payload.h diff --git a/board/efi/efi-x86_payload/Kconfig b/board/efi/efi-x86_payload/Kconfig index 6d062499346..c500ca02ebf 100644 --- a/board/efi/efi-x86_payload/Kconfig +++ b/board/efi/efi-x86_payload/Kconfig @@ -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 diff --git a/board/efi/efi-x86_payload/MAINTAINERS b/board/efi/efi-x86_payload/MAINTAINERS index d795d60e09e..3c5d48aa84c 100644 --- a/board/efi/efi-x86_payload/MAINTAINERS +++ b/board/efi/efi-x86_payload/MAINTAINERS @@ -3,6 +3,5 @@ M: Bin Meng 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 diff --git a/include/configs/efi-x86_payload.h b/include/configs/efi-x86_payload.h deleted file mode 100644 index e00c408f29a..00000000000 --- a/include/configs/efi-x86_payload.h +++ /dev/null @@ -1,4 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright (C) 2018, Bin Meng - */ -- cgit v1.3.1 From 5b70814f2491c904816bcefcee030f55ac377898 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 22 Jan 2024 17:39:15 -0500 Subject: galileo: Remove empty config header Now that we support having CONFIG_SYS_CONFIG_NAME be unset to indicate a lack of board.h file, unset this on the galileo platform and remove the otherwise empty file. Signed-off-by: Tom Rini --- board/intel/galileo/Kconfig | 3 --- board/intel/galileo/MAINTAINERS | 1 - include/configs/galileo.h | 4 ---- 3 files changed, 8 deletions(-) delete mode 100644 include/configs/galileo.h diff --git a/board/intel/galileo/Kconfig b/board/intel/galileo/Kconfig index 4c0451da48d..15c8d125408 100644 --- a/board/intel/galileo/Kconfig +++ b/board/intel/galileo/Kconfig @@ -9,9 +9,6 @@ config SYS_VENDOR config SYS_SOC default "quark" -config SYS_CONFIG_NAME - default "galileo" - config TEXT_BASE default 0xfff10000 diff --git a/board/intel/galileo/MAINTAINERS b/board/intel/galileo/MAINTAINERS index dbbc82e8a1d..a5dcde7ad09 100644 --- a/board/intel/galileo/MAINTAINERS +++ b/board/intel/galileo/MAINTAINERS @@ -2,5 +2,4 @@ INTEL GALILEO BOARD M: Bin Meng S: Maintained F: board/intel/galileo/ -F: include/configs/galileo.h F: configs/galileo_defconfig diff --git a/include/configs/galileo.h b/include/configs/galileo.h deleted file mode 100644 index 9b0f5cedcd7..00000000000 --- a/include/configs/galileo.h +++ /dev/null @@ -1,4 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright (C) 2015, Bin Meng - */ -- cgit v1.3.1 From ecdd57763bacfeaadeb402157a3ab9404ecc5f1b Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 22 Jan 2024 17:39:16 -0500 Subject: minnowmax: Remove empty config header Now that we support having CONFIG_SYS_CONFIG_NAME be unset to indicate a lack of board.h file, unset this on the minnowmax platform and remove the otherwise empty file. Signed-off-by: Tom Rini --- board/intel/minnowmax/Kconfig | 3 --- board/intel/minnowmax/MAINTAINERS | 1 - include/configs/minnowmax.h | 4 ---- 3 files changed, 8 deletions(-) delete mode 100644 include/configs/minnowmax.h diff --git a/board/intel/minnowmax/Kconfig b/board/intel/minnowmax/Kconfig index a03ef867801..abb1d45ff61 100644 --- a/board/intel/minnowmax/Kconfig +++ b/board/intel/minnowmax/Kconfig @@ -9,9 +9,6 @@ config SYS_VENDOR config SYS_SOC default "baytrail" -config SYS_CONFIG_NAME - default "minnowmax" - config TEXT_BASE default 0xfff00000 diff --git a/board/intel/minnowmax/MAINTAINERS b/board/intel/minnowmax/MAINTAINERS index d655761d578..5cb94b0f36c 100644 --- a/board/intel/minnowmax/MAINTAINERS +++ b/board/intel/minnowmax/MAINTAINERS @@ -2,5 +2,4 @@ CircuitCo Minnowboard Max M: Simon Glass S: Maintained F: board/intel/minnowmax -F: include/configs/minnowmax.h F: configs/minnowmax_defconfig diff --git a/include/configs/minnowmax.h b/include/configs/minnowmax.h deleted file mode 100644 index 068a2af2c1f..00000000000 --- a/include/configs/minnowmax.h +++ /dev/null @@ -1,4 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright (C) 2015 Google, Inc - */ -- cgit v1.3.1 From f7913054e91f70daf00013bc6dc9ca0dbe263319 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 22 Jan 2024 17:39:17 -0500 Subject: qemu-x86*: Remove empty config header Now that we support having CONFIG_SYS_CONFIG_NAME be unset to indicate a lack of board.h file, unset this on the qemu-x86* platforms and remove the otherwise empty file. Signed-off-by: Tom Rini --- board/emulation/qemu-x86/Kconfig | 3 --- board/emulation/qemu-x86/MAINTAINERS | 2 -- include/configs/qemu-x86.h | 4 ---- 3 files changed, 9 deletions(-) delete mode 100644 include/configs/qemu-x86.h diff --git a/board/emulation/qemu-x86/Kconfig b/board/emulation/qemu-x86/Kconfig index 01dc1d497ae..9a0611820ce 100644 --- a/board/emulation/qemu-x86/Kconfig +++ b/board/emulation/qemu-x86/Kconfig @@ -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 diff --git a/board/emulation/qemu-x86/MAINTAINERS b/board/emulation/qemu-x86/MAINTAINERS index e62585a65d7..efb8b46daaf 100644 --- a/board/emulation/qemu-x86/MAINTAINERS +++ b/board/emulation/qemu-x86/MAINTAINERS @@ -3,7 +3,6 @@ M: Bin Meng 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 S: Maintained F: board/emulation/qemu-x86/ F: board/emulation/common/ -F: include/configs/qemu-x86.h F: configs/qemu-x86_64_defconfig diff --git a/include/configs/qemu-x86.h b/include/configs/qemu-x86.h deleted file mode 100644 index 9b0f5cedcd7..00000000000 --- a/include/configs/qemu-x86.h +++ /dev/null @@ -1,4 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright (C) 2015, Bin Meng - */ -- cgit v1.3.1 From 4be2311bf4af0a3e0ee0ca745c0227319322f897 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 22 Jan 2024 17:39:18 -0500 Subject: slimbootloader: Remove empty config header Now that we support having CONFIG_SYS_CONFIG_NAME be unset to indicate a lack of board.h file, unset this on the slimbootloader platform and remove the otherwise empty file. Signed-off-by: Tom Rini --- board/intel/slimbootloader/Kconfig | 3 --- board/intel/slimbootloader/MAINTAINERS | 1 - include/configs/slimbootloader.h | 4 ---- 3 files changed, 8 deletions(-) delete mode 100644 include/configs/slimbootloader.h diff --git a/board/intel/slimbootloader/Kconfig b/board/intel/slimbootloader/Kconfig index 015ed51dc89..11e6cb37bd8 100644 --- a/board/intel/slimbootloader/Kconfig +++ b/board/intel/slimbootloader/Kconfig @@ -13,9 +13,6 @@ config SYS_VENDOR config SYS_SOC default "slimbootloader" -config SYS_CONFIG_NAME - default "slimbootloader" - config TEXT_BASE default 0x00100000 diff --git a/board/intel/slimbootloader/MAINTAINERS b/board/intel/slimbootloader/MAINTAINERS index e6935517e01..0208a382ac6 100644 --- a/board/intel/slimbootloader/MAINTAINERS +++ b/board/intel/slimbootloader/MAINTAINERS @@ -2,5 +2,4 @@ Intel Slim Bootloader Payload M: Aiden Park S: Maintained F: board/intel/slimbootloader -F: include/configs/slimbootloader.h F: configs/slimbootloader_defconfig diff --git a/include/configs/slimbootloader.h b/include/configs/slimbootloader.h deleted file mode 100644 index 85f6a968e04..00000000000 --- a/include/configs/slimbootloader.h +++ /dev/null @@ -1,4 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright (C) 2019 Intel Corporation - */ -- cgit v1.3.1 From 770afff24aa56d7d992682fbad396e5b7f0a969e Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 22 Jan 2024 17:39:19 -0500 Subject: hc2910-2aghd05: Remove empty config header Now that we support having CONFIG_SYS_CONFIG_NAME be unset to indicate a lack of board.h file, unset this on the hc2910-2aghd05 platform and remove the otherwise empty file. Signed-off-by: Tom Rini --- board/skyworth/hc2910-2aghd05/Kconfig | 3 --- board/skyworth/hc2910-2aghd05/MAINTAINERS | 1 - include/configs/hc2910-2aghd05.h | 6 ------ 3 files changed, 10 deletions(-) delete mode 100644 include/configs/hc2910-2aghd05.h diff --git a/board/skyworth/hc2910-2aghd05/Kconfig b/board/skyworth/hc2910-2aghd05/Kconfig index f85f1f2631d..620a3177f48 100644 --- a/board/skyworth/hc2910-2aghd05/Kconfig +++ b/board/skyworth/hc2910-2aghd05/Kconfig @@ -9,7 +9,4 @@ config SYS_VENDOR config SYS_SOC default "hi3798mv200" -config SYS_CONFIG_NAME - default "hc2910-2aghd05" - endif diff --git a/board/skyworth/hc2910-2aghd05/MAINTAINERS b/board/skyworth/hc2910-2aghd05/MAINTAINERS index 2c1e750018e..13915556bc5 100644 --- a/board/skyworth/hc2910-2aghd05/MAINTAINERS +++ b/board/skyworth/hc2910-2aghd05/MAINTAINERS @@ -2,5 +2,4 @@ HC2910 2AGHD05 BOARD M: Yang Xiwen S: Maintained F: board/skyworth/hc2910-2aghd05 -F: include/configs/hc2910-2aghd05.h F: configs/hc2910_2aghd05_defconfig diff --git a/include/configs/hc2910-2aghd05.h b/include/configs/hc2910-2aghd05.h deleted file mode 100644 index 3db9a474ec7..00000000000 --- a/include/configs/hc2910-2aghd05.h +++ /dev/null @@ -1,6 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ - -#ifndef __HC2910_2AGHD05_CONFIG_H__ -#define __HC2910_2AGHD05_CONFIG_H__ - -#endif -- cgit v1.3.1 From 3dd1486800d3aa0cff114a34d7dc1cdc3f47c172 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 22 Jan 2024 17:39:20 -0500 Subject: 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 --- arch/Kconfig | 11 ++++++++++- arch/arm/mach-mediatek/Kconfig | 6 ------ arch/arm/mach-meson/Kconfig | 8 -------- arch/arm/mach-versal-net/Kconfig | 8 -------- arch/arm/mach-versal/Kconfig | 8 -------- arch/arm/mach-zynq/Kconfig | 8 -------- arch/arm/mach-zynqmp-r5/Kconfig | 8 -------- arch/arm/mach-zynqmp/Kconfig | 8 -------- arch/mips/mach-mtmips/mt7620/Kconfig | 1 - arch/mips/mach-mtmips/mt7621/Kconfig | 1 - arch/mips/mach-mtmips/mt7628/Kconfig | 1 - arch/nios2/Kconfig | 7 ------- board/Marvell/octeon_ebb7304/Kconfig | 1 - board/Marvell/octeon_nic23/Kconfig | 1 - board/cadence/xtfpga/Kconfig | 1 - board/cavium/thunderx/Kconfig | 1 - board/freescale/imxrt1020-evk/Kconfig | 1 - board/freescale/imxrt1050-evk/Kconfig | 1 - board/freescale/imxrt1170-evk/Kconfig | 1 - board/kontron/sl-mx6ul/Kconfig | 1 - board/kontron/sl-mx8mm/Kconfig | 1 - board/samsung/starqltechn/Kconfig | 8 -------- board/sielaff/imx6dl-sielaff/Kconfig | 1 - board/st/stih410-b2260/Kconfig | 1 - board/st/stm32f429-discovery/Kconfig | 1 - board/st/stm32f429-evaluation/Kconfig | 1 - board/st/stm32f469-discovery/Kconfig | 1 - board/st/stm32f746-disco/Kconfig | 1 - board/st/stm32h743-disco/Kconfig | 1 - board/st/stm32h743-eval/Kconfig | 1 - board/st/stm32h750-art-pi/Kconfig | 1 - board/sysam/amcore/Kconfig | 1 - board/xilinx/microblaze-generic/Kconfig | 8 -------- 33 files changed, 10 insertions(+), 100 deletions(-) diff --git a/arch/Kconfig b/arch/Kconfig index b6fb9e92733..0d3cce919f8 100644 --- 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/.h diff --git a/arch/arm/mach-mediatek/Kconfig b/arch/arm/mach-mediatek/Kconfig index c3872f42869..82018bd9d3e 100644 --- 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/.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 d6c89058061..6e6f9c13f17 100644 --- a/arch/arm/mach-meson/Kconfig +++ b/arch/arm/mach-meson/Kconfig @@ -88,12 +88,4 @@ config SYS_BOARD Based on this option 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/.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 edff5b039e9..1b5339993f8 100644 --- 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/.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 645f06add44..629a14129d5 100644 --- 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/.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 b4c439b4cd6..265e9ce588a 100644 --- 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/.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 f14514b3c7c..b2ba896e9b4 100644 --- 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/.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 7e7c87d16fa..6a7be0b4271 100644 --- 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/.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 3ca711ad0f3..398c7c6a948 100644 --- 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 008a28f991c..8fe6e0a2d9a 100644 --- 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 e7273591bca..79b2ddc6692 100644 --- 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 bb4fb2ac3a5..b06b3efcf56 100644 --- 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/.h - should be included from include/config.h. - endmenu diff --git a/board/Marvell/octeon_ebb7304/Kconfig b/board/Marvell/octeon_ebb7304/Kconfig index ab54e6dbbc3..b3244f751b1 100644 --- 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 3c42e8acdad..468bbb756e6 100644 --- 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 69296be49c7..a64961e6d6a 100644 --- 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 927d8765d67..3d4b260ea29 100644 --- 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 d00cbff094b..3cb8fb1e6e9 100644 --- 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 79e6e4524ad..068130beca9 100644 --- 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 c61fc579713..b433d6e5df0 100644 --- 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 4e58de20947..782e099cec2 100644 --- 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 9dcf407c867..1cfe9ee64bd 100644 --- 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 0eea666d035..e928cb0ea89 100644 --- 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/.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 1b74a7d90ee..7876ab14c07 100644 --- 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 590add05fea..441a83cbaea 100644 --- 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 e73d11bada4..3c93df20afa 100644 --- 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 ca4bb3d9c95..eaa40db8a74 100644 --- 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 de61b6f2f6d..622a8d82d81 100644 --- 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 09289d23238..86ace17377c 100644 --- 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 7d6ec1d9586..bc116bcf32f 100644 --- 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 ea879b13c8b..ff86de25f7d 100644 --- 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 c31b9849fde..ab2d0f227d7 100644 --- 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 dd9816ec243..e13ee8f6e90 100644 --- 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 dd5eacef52a..038ff0b6130 100644 --- 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/.h header - will be used for board configuration. - config XILINX_MICROBLAZE0_USE_MSR_INSTR int "USE_MSR_INSTR range (0:1)" default 0 -- cgit v1.3.1