Skip to contentSkip to conversation

kbuild: Allow for CONFIG_SYS_CONFIG_NAME to be unset

PATCH In review Tom Rini 3 participants 22 messages Jan 22, 2024 – Feb 27, 2024

Subsystems (10)
lore
Share & tools
lore

Tom Rini

author
#0 lore raw

PATCH 1/16 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.

---
 scripts/Makefile.autoconf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/Makefile.autoconf +1 -1
index 0ade91642ae3..8208ffe22744 100644
@@ -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\>;)
Signature · 1 line
2.34.1
author
#1 lore raw

PATCH 2/16 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.

---
Cc: Michal Simek <[email protected]>

---
 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
board/xilinx/mbv/Kconfig +0 -3
index 4bc9f72c541b..d2dec397ed6f 100644
@@ -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
board/xilinx/mbv/MAINTAINERS +0 -1
index 445654fe740e..db9f03388df9 100644
@@ -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
include/configs/xilinx_mbv.h deleted +0 -6
deleted file mode 100644
index dba398aeec49..000000000000
@@ -1,6 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * (C) Copyright 2023, Advanced Micro Devices, Inc.
- *
- * Michal Simek <[email protected]>
- */
Signature · 1 line
2.34.1
maintainer Acked-by on v1 2/16
#2 lore raw

Re: [PATCH 02/16] xilinx_mbv: Remove empty config header

Quoted 43 lines · Tom Rini

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.

---
Cc: Michal Simek <[email protected]>

---
  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

board/xilinx/mbv/Kconfig +0 -3
index 4bc9f72c541b..d2dec397ed6f 100644
@@ -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
board/xilinx/mbv/MAINTAINERS +0 -1
index 445654fe740e..db9f03388df9 100644
@@ -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
include/configs/xilinx_mbv.h deleted +0 -0
deleted file mode 100644
index dba398aeec49..000000000000

include/configs/xilinx_mbv.h line 6

Quoted 6 lines
include/configs/xilinx_mbv.h deleted +0 -6
@@ -1,6 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * (C) Copyright 2023, Advanced Micro Devices, Inc.
- *
- * Michal Simek <[email protected]>
- */

But maybe in future we need to revert this patch to add more options there.
Or do you plan to remove all of these configs?
I can imagine distro boot wiring but that can be done via vars file only but it is not practical.

Thanks,
Michal

author
#3 lore raw

Re: [PATCH 02/16] xilinx_mbv: Remove empty config header

Quoted 54 lines · Michal Simek
Quoted 42 lines · Tom Rini

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.

---
Cc: Michal Simek <[email protected]>

---
  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

board/xilinx/mbv/Kconfig +0 -3
index 4bc9f72c541b..d2dec397ed6f 100644
@@ -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
board/xilinx/mbv/MAINTAINERS +0 -1
index 445654fe740e..db9f03388df9 100644
@@ -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
include/configs/xilinx_mbv.h deleted +0 -0
deleted file mode 100644
index dba398aeec49..000000000000

include/configs/xilinx_mbv.h line 6

Quoted 6 lines
include/configs/xilinx_mbv.h deleted +0 -6
@@ -1,6 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * (C) Copyright 2023, Advanced Micro Devices, Inc.
- *
- * Michal Simek <[email protected]>
- */
Quoted 4 lines

But maybe in future we need to revert this patch to add more options there. Or do you plan to remove all of these configs?
I can imagine distro boot wiring but that can be done via vars file only but it is not practical.

Do you mean that plain text environment feels impractical for standard boot (which should be used instead of the pure scripts of distro_boot) ?

Signature · 1 line
Tom
maintainer
#4 lore raw

Re: [PATCH 02/16] xilinx_mbv: Remove empty config header

Quoted 55 lines · Tom Rini
Quoted 54 lines · Michal Simek
Quoted 42 lines · Tom Rini

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.

---
Cc: Michal Simek <[email protected]>

---
   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

board/xilinx/mbv/Kconfig +0 -3
index 4bc9f72c541b..d2dec397ed6f 100644
@@ -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
board/xilinx/mbv/MAINTAINERS +0 -1
index 445654fe740e..db9f03388df9 100644
@@ -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
include/configs/xilinx_mbv.h deleted +0 -0
deleted file mode 100644
index dba398aeec49..000000000000

include/configs/xilinx_mbv.h line 6

Quoted 6 lines
include/configs/xilinx_mbv.h deleted +0 -6
@@ -1,6 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * (C) Copyright 2023, Advanced Micro Devices, Inc.
- *
- * Michal Simek <[email protected]>
- */
Quoted 7 lines
Quoted 4 lines

But maybe in future we need to revert this patch to add more options there. Or do you plan to remove all of these configs?
I can imagine distro boot wiring but that can be done via vars file only but it is not practical.

Do you mean that plain text environment feels impractical for standard boot (which should be used instead of the pure scripts of distro_boot) ?

I didn't play with standard boot yet to find out how to prioritize certain devices at run time. But normally we are trying to keep all amd platforms in sync to make sure that from user perspective doesn't really matter if you are on microblaze, arm32, arm64 or risc-v based platform.

There are still a lot of configs like GUIDs, dfu and others that I don't think we will end up without these config files anytime soon. But it doesn't mean we shouldn't aim for it.

Thanks,
Michal

author
#5 lore raw

Re: [PATCH 02/16] xilinx_mbv: Remove empty config header

Quoted 66 lines · Michal Simek
Quoted 55 lines · Tom Rini
Quoted 54 lines · Michal Simek
Quoted 42 lines · Tom Rini

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.

---
Cc: Michal Simek <[email protected]>

---
   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

board/xilinx/mbv/Kconfig +0 -3
index 4bc9f72c541b..d2dec397ed6f 100644
@@ -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
board/xilinx/mbv/MAINTAINERS +0 -1
index 445654fe740e..db9f03388df9 100644
@@ -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
include/configs/xilinx_mbv.h deleted +0 -0
deleted file mode 100644
index dba398aeec49..000000000000

include/configs/xilinx_mbv.h line 6

Quoted 6 lines
include/configs/xilinx_mbv.h deleted +0 -6
@@ -1,6 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * (C) Copyright 2023, Advanced Micro Devices, Inc.
- *
- * Michal Simek <[email protected]>
- */
Quoted 7 lines
Quoted 4 lines

But maybe in future we need to revert this patch to add more options there. Or do you plan to remove all of these configs?
I can imagine distro boot wiring but that can be done via vars file only but it is not practical.

Do you mean that plain text environment feels impractical for standard boot (which should be used instead of the pure scripts of distro_boot) ?

Quoted 8 lines

I didn't play with standard boot yet to find out how to prioritize certain devices at run time. But normally we are trying to keep all amd platforms in sync to make sure that from user perspective doesn't really matter if you are on microblaze, arm32, arm64 or risc-v based platform.

There are still a lot of configs like GUIDs, dfu and others that I don't think we will end up without these config files anytime soon. But it doesn't mean we shouldn't aim for it.

OK. Yeah, after a quick look at include/configs/xilinx* today, a lot of that could just be in standard boot and plain text environment and just like there's include/env/ti/ today to share common logic, we should get include/env/amd/ to share some common logic too. Or you and your team can suggest a better sharing alternative too.

Signature · 1 line
Tom
author
#6 lore raw

PATCH 3/16 coreboot: Remove empty config header

In reply to Tom Rini

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.

---
Cc: Bin Meng <[email protected]>

---
 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
board/coreboot/coreboot/Kconfig +0 -7
index 4f41ce1abf10..abbf08ac695e 100644
@@ -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
board/coreboot/coreboot/MAINTAINERS +0 -1
index f77736580006..d97383c030cd 100644
@@ -2,7 +2,6 @@ COREBOOT BOARD
 M:	Simon Glass <[email protected]>
 S:	Maintained
 F:	board/coreboot/
-F:	include/configs/coreboot.h
 F:	configs/coreboot_defconfig
 
 COREBOOT64 BOARD
include/configs/coreboot.h deleted +0 -4
deleted file mode 100644
index e00c408f29a5..000000000000
@@ -1,4 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (C) 2018, Bin Meng <[email protected]>
- */
Signature · 1 line
2.34.1
author
#7 lore raw

PATCH 4/16 bayleybay: Remove empty config header

In reply to Tom Rini

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.

---
Cc: Bin Meng <[email protected]>

---
 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
board/intel/bayleybay/Kconfig +0 -3
index 97228d630878..af08566014dc 100644
@@ -9,9 +9,6 @@ config SYS_VENDOR
 config SYS_SOC
 	default "baytrail"
 
-config SYS_CONFIG_NAME
-	default "bayleybay"
-
 config TEXT_BASE
 	default 0xfff00000
 
board/intel/bayleybay/MAINTAINERS +0 -1
index 85fa51626af7..5ab5d73f59e5 100644
@@ -2,5 +2,4 @@ Intel Bayley Bay
 M:	Bin Meng <[email protected]>
 S:	Maintained
 F:	board/intel/bayleybay
-F:	include/configs/bayleybay.h
 F:	configs/bayleybay_defconfig
include/configs/bayleybay.h deleted +0 -4
deleted file mode 100644
index 9b0f5cedcd79..000000000000
@@ -1,4 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (C) 2015, Bin Meng <[email protected]>
- */
Signature · 1 line
2.34.1
author
#8 lore raw

PATCH 5/16 cherryhill: Remove empty config header

In reply to Tom Rini

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.

---
Cc: Bin Meng <[email protected]>

---
 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
board/intel/cherryhill/Kconfig +0 -3
index 009cd93b6d44..28e4735e4d65 100644
@@ -9,9 +9,6 @@ config SYS_VENDOR
 config SYS_SOC
 	default "braswell"
 
-config SYS_CONFIG_NAME
-	default "cherryhill"
-
 config TEXT_BASE
 	default 0xffe00000
 
board/intel/cherryhill/MAINTAINERS +0 -1
index 6e90f642125e..7c1b311990c4 100644
@@ -2,5 +2,4 @@ INTEL CHERRYHILL BOARD
 M:	Bin Meng <[email protected]>
 S:	Maintained
 F:	board/intel/cherryhill/
-F:	include/configs/cherryhill.h
 F:	configs/cherryhill_defconfig
include/configs/cherryhill.h deleted +0 -4
deleted file mode 100644
index a3009571de98..000000000000
@@ -1,4 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (C) 2017, Bin Meng <[email protected]>
- */
Signature · 1 line
2.34.1
author
#9 lore raw

PATCH 6/16 cougarcanyon2: Remove empty config header

In reply to Tom Rini

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.

---
Cc: Bin Meng <[email protected]>

---
 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
board/intel/cougarcanyon2/Kconfig +0 -3
index 32407025bc16..841e041167e8 100644
@@ -9,9 +9,6 @@ config SYS_VENDOR
 config SYS_SOC
 	default "ivybridge"
 
-config SYS_CONFIG_NAME
-	default "cougarcanyon2"
-
 config TEXT_BASE
 	default 0xffe00000
 
board/intel/cougarcanyon2/MAINTAINERS +0 -1
index a486739b5eea..a4f465cf5df3 100644
@@ -2,5 +2,4 @@ INTEL COUGAR CANYON 2 BOARD
 M:	Bin Meng <[email protected]>
 S:	Maintained
 F:	board/intel/cougarcanyon2/
-F:	include/configs/cougarcanyon2.h
 F:	configs/cougarcanyon2_defconfig
include/configs/cougarcanyon2.h deleted +0 -4
deleted file mode 100644
index 0406786f7c66..000000000000
@@ -1,4 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (C) 2016, Bin Meng <[email protected]>
- */
Signature · 1 line
2.34.1
author
#10 lore raw

PATCH 7/16 crownbay: Remove empty config header

In reply to Tom Rini

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.

---
Cc: Bin Meng <[email protected]>

---
 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
board/intel/crownbay/Kconfig +0 -3
index eb2290cfafbe..09614ab8d155 100644
@@ -9,9 +9,6 @@ config SYS_VENDOR
 config SYS_SOC
 	default "queensbay"
 
-config SYS_CONFIG_NAME
-	default "crownbay"
-
 config TEXT_BASE
 	default 0xfff00000
 
board/intel/crownbay/MAINTAINERS +0 -1
index 1eb68693df3e..e2d8e6bc1d0d 100644
@@ -2,5 +2,4 @@ INTEL CROWNBAY BOARD
 M:	Bin Meng <[email protected]>
 S:	Maintained
 F:	board/intel/crownbay/
-F:	include/configs/crownbay.h
 F:	configs/crownbay_defconfig
include/configs/crownbay.h deleted +0 -4
deleted file mode 100644
index 0c842dd01ebe..000000000000
@@ -1,4 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (C) 2014, Bin Meng <[email protected]>
- */
Signature · 1 line
2.34.1
author
#11 lore raw

PATCH 8/16 edison: Remove empty config header

In reply to Tom Rini

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.

---
Cc: Andy Shevchenko <[email protected]>

---
 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
board/intel/edison/Kconfig +0 -3
index 5efda4b3a554..daa8d2035cd5 100644
@@ -9,9 +9,6 @@ config SYS_VENDOR
 config SYS_SOC
 	default "tangier"
 
-config SYS_CONFIG_NAME
-	default "edison"
-
 config SYS_MALLOC_LEN
 	default 0x08000000
 
board/intel/edison/MAINTAINERS +0 -1
index 4bc4a00c8ad8..26b27c5dfe15 100644
@@ -2,5 +2,4 @@ Intel Edison Board
 M:	Andy Shevchenko <[email protected]>
 S:	Maintained
 F:	board/intel/edison
-F:	include/configs/edison.h
 F:	configs/edison_defconfig
include/configs/edison.h deleted +0 -4
deleted file mode 100644
index 127c2c4546e0..000000000000
@@ -1,4 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (c) 2017 Intel Corp.
- */
Signature · 1 line
2.34.1
Acked-by on v1 8/16
#12 lore raw

Re: [PATCH 08/16] edison: Remove empty config header

Quoted 3 lines · Tom Rini

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.

Signature · 2 lines
With Best Regards,
Andy Shevchenko
author
#13 lore raw

PATCH 9/16 efi-x86_app: Remove empty config header

In reply to Tom Rini

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.

---
Cc: Simon Glass <[email protected]>
Cc: Heinrich Schuchardt <[email protected]>

---
 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
board/efi/efi-x86_app/Kconfig +0 -3
index ecd08d73146a..f9cbef0a864c 100644
@@ -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
board/efi/efi-x86_app/MAINTAINERS +0 -2
index 584619c51dff..693f367311bc 100644
@@ -3,7 +3,6 @@ M:	Simon Glass <[email protected]>
 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 <[email protected]>
 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
include/configs/efi-x86_app.h deleted +0 -4
deleted file mode 100644
index d5824049d697..000000000000
@@ -1,4 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (c) 2015 Google, Inc
- */
Signature · 1 line
2.34.1
author
#14 lore raw

PATCH 10/16 efi-x86_payload: Remove empty config header

In reply to Tom Rini

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.

---
Cc: Simon Glass <[email protected]>
Cc: Heinrich Schuchardt <[email protected]>

---
 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
board/efi/efi-x86_payload/Kconfig +0 -3
index 6d062499346d..c500ca02ebf5 100644
@@ -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
 
board/efi/efi-x86_payload/MAINTAINERS +0 -1
index d795d60e09e4..3c5d48aa84cc 100644
@@ -3,6 +3,5 @@ M:	Bin Meng <[email protected]>
 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
include/configs/efi-x86_payload.h deleted +0 -4
deleted file mode 100644
index e00c408f29a5..000000000000
@@ -1,4 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (C) 2018, Bin Meng <[email protected]>
- */
Signature · 1 line
2.34.1
author
#15 lore raw

PATCH 11/16 galileo: Remove empty config header

In reply to Tom Rini

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.

---
Cc: Bin Meng <[email protected]>

---
 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
board/intel/galileo/Kconfig +0 -3
index 4c0451da48da..15c8d1254089 100644
@@ -9,9 +9,6 @@ config SYS_VENDOR
 config SYS_SOC
 	default "quark"
 
-config SYS_CONFIG_NAME
-	default "galileo"
-
 config TEXT_BASE
 	default 0xfff10000
 
board/intel/galileo/MAINTAINERS +0 -1
index dbbc82e8a1db..a5dcde7ad09d 100644
@@ -2,5 +2,4 @@ INTEL GALILEO BOARD
 M:	Bin Meng <[email protected]>
 S:	Maintained
 F:	board/intel/galileo/
-F:	include/configs/galileo.h
 F:	configs/galileo_defconfig
include/configs/galileo.h deleted +0 -4
deleted file mode 100644
index 9b0f5cedcd79..000000000000
@@ -1,4 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (C) 2015, Bin Meng <[email protected]>
- */
Signature · 1 line
2.34.1
author
#16 lore raw

PATCH 12/16 minnowmax: Remove empty config header

In reply to Tom Rini

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.

---
Cc: Simon Glass <[email protected]>

---
 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
board/intel/minnowmax/Kconfig +0 -3
index a03ef8678014..abb1d45ff614 100644
@@ -9,9 +9,6 @@ config SYS_VENDOR
 config SYS_SOC
 	default "baytrail"
 
-config SYS_CONFIG_NAME
-	default "minnowmax"
-
 config TEXT_BASE
 	default 0xfff00000
 
board/intel/minnowmax/MAINTAINERS +0 -1
index d655761d5783..5cb94b0f36c6 100644
@@ -2,5 +2,4 @@ CircuitCo Minnowboard Max
 M:	Simon Glass <[email protected]>
 S:	Maintained
 F:	board/intel/minnowmax
-F:	include/configs/minnowmax.h
 F:	configs/minnowmax_defconfig
include/configs/minnowmax.h deleted +0 -4
deleted file mode 100644
index 068a2af2c1fc..000000000000
@@ -1,4 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (C) 2015 Google, Inc
- */
Signature · 1 line
2.34.1
author
#17 lore raw

PATCH 13/16 qemu-x86*: Remove empty config header

In reply to Tom Rini

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.

---
Cc: Bin Meng <[email protected]>

---
 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
board/emulation/qemu-x86/Kconfig +0 -3
index 01dc1d497aec..9a0611820ce1 100644
@@ -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
board/emulation/qemu-x86/MAINTAINERS +0 -2
index e62585a65d7d..efb8b46daaf4 100644
@@ -3,7 +3,6 @@ M:	Bin Meng <[email protected]>
 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 <[email protected]>
 S:	Maintained
 F:	board/emulation/qemu-x86/
 F:	board/emulation/common/
-F:	include/configs/qemu-x86.h
 F:	configs/qemu-x86_64_defconfig
include/configs/qemu-x86.h deleted +0 -4
deleted file mode 100644
index 9b0f5cedcd79..000000000000
@@ -1,4 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (C) 2015, Bin Meng <[email protected]>
- */
Signature · 1 line
2.34.1
author
#18 lore raw

PATCH 14/16 slimbootloader: Remove empty config header

In reply to Tom Rini

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.

---
Cc: Aiden Park <[email protected]>

---
 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
board/intel/slimbootloader/Kconfig +0 -3
index 015ed51dc89c..11e6cb37bd85 100644
@@ -13,9 +13,6 @@ config SYS_VENDOR
 config SYS_SOC
 	default "slimbootloader"
 
-config SYS_CONFIG_NAME
-	default "slimbootloader"
-
 config TEXT_BASE
 	default 0x00100000
 
board/intel/slimbootloader/MAINTAINERS +0 -1
index e6935517e01a..0208a382ac6b 100644
@@ -2,5 +2,4 @@ Intel Slim Bootloader Payload
 M:	Aiden Park <[email protected]>
 S:	Maintained
 F:	board/intel/slimbootloader
-F:	include/configs/slimbootloader.h
 F:	configs/slimbootloader_defconfig
include/configs/slimbootloader.h deleted +0 -4
deleted file mode 100644
index 85f6a968e040..000000000000
@@ -1,4 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (C) 2019 Intel Corporation <www.intel.com>
- */
Signature · 1 line
2.34.1
author
#19 lore raw

PATCH 15/16 hc2910-2aghd05: Remove empty config header

In reply to Tom Rini

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.

---
Cc: Yang Xiwen <[email protected]>

---
 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
board/skyworth/hc2910-2aghd05/Kconfig +0 -3
index f85f1f2631de..620a3177f488 100644
@@ -9,7 +9,4 @@ config SYS_VENDOR
 config SYS_SOC
 	default "hi3798mv200"
 
-config SYS_CONFIG_NAME
-	default "hc2910-2aghd05"
-
 endif
board/skyworth/hc2910-2aghd05/MAINTAINERS +0 -1
index 2c1e750018e1..13915556bc5e 100644
@@ -2,5 +2,4 @@ HC2910 2AGHD05 BOARD
 M: Yang Xiwen <[email protected]>
 S: Maintained
 F: board/skyworth/hc2910-2aghd05
-F: include/configs/hc2910-2aghd05.h
 F: configs/hc2910_2aghd05_defconfig
include/configs/hc2910-2aghd05.h deleted +0 -6
deleted file mode 100644
index 3db9a474ec7f..000000000000
@@ -1,6 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-
-#ifndef __HC2910_2AGHD05_CONFIG_H__
-#define __HC2910_2AGHD05_CONFIG_H__
-
-#endif
Signature · 1 line
2.34.1
author
#20 lore raw

PATCH 16/16 Kconfig: Centralize prompting for SYS_CONFIG_NAME

In reply to Tom Rini

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.

---
 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/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 --------
 32 files changed, 10 insertions(+), 99 deletions(-)
arch/Kconfig +10 -1
index b6fb9e927337..0d3cce919f8f 100644
@@ -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
arch/arm/mach-mediatek/Kconfig +0 -6
index c3872f428697..82018bd9d3e3 100644
@@ -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
arch/arm/mach-meson/Kconfig +0 -8
index d6c890580617..6e6f9c13f17d 100644
@@ -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
arch/arm/mach-versal-net/Kconfig +0 -8
index edff5b039e91..1b5339993f83 100644
@@ -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
arch/arm/mach-versal/Kconfig +0 -8
index 645f06add44d..629a14129d5a 100644
@@ -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
 
arch/arm/mach-zynq/Kconfig +0 -8
index b4c439b4cd6d..265e9ce588ad 100644
@@ -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
 
arch/arm/mach-zynqmp-r5/Kconfig +0 -8
index f14514b3c7c1..b2ba896e9b41 100644
@@ -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
arch/arm/mach-zynqmp/Kconfig +0 -8
index 7e7c87d16fa9..6a7be0b42715 100644
@@ -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
arch/mips/mach-mtmips/mt7620/Kconfig +0 -1
index 3ca711ad0f3f..398c7c6a9486 100644
@@ -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
arch/mips/mach-mtmips/mt7621/Kconfig +0 -1
index 008a28f991ca..8fe6e0a2d9a8 100644
@@ -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
arch/mips/mach-mtmips/mt7628/Kconfig +0 -1
index e7273591bca1..79b2ddc6692d 100644
@@ -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"
arch/nios2/Kconfig +0 -7
index bb4fb2ac3a5c..b06b3efcf563 100644
@@ -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
board/Marvell/octeon_ebb7304/Kconfig +0 -1
index ab54e6dbbc35..b3244f751b1f 100644
@@ -9,7 +9,6 @@ config SYS_VENDOR
 	default "Marvell"
 
 config SYS_CONFIG_NAME
-	string
 	default "octeon_ebb7304"
 
 config DEFAULT_DEVICE_TREE
board/Marvell/octeon_nic23/Kconfig +0 -1
index 3c42e8acdadc..468bbb756e61 100644
@@ -9,7 +9,6 @@ config SYS_VENDOR
 	default "Marvell"
 
 config SYS_CONFIG_NAME
-	string
 	default "octeon_nic23"
 
 config DEFAULT_DEVICE_TREE
board/cadence/xtfpga/Kconfig +0 -1
index 69296be49c7a..a64961e6d6a3 100644
@@ -25,7 +25,6 @@ config SYS_VENDOR
 	default "cadence"
 
 config SYS_CONFIG_NAME
-	string
 	default "xtfpga"
 
 config BOARD_SDRAM_SIZE
board/cavium/thunderx/Kconfig +0 -1
index 927d8765d675..3d4b260ea29c 100644
@@ -13,7 +13,6 @@ config SYS_VENDOR
 	default "cavium"
 
 config SYS_CONFIG_NAME
-	string
 	default "thunderx_88xx"
 
 config CMD_ATF
board/freescale/imxrt1020-evk/Kconfig +0 -1
index d00cbff094b7..3cb8fb1e6e9f 100644
@@ -13,7 +13,6 @@ config SYS_SOC
 	default "imxrt1020"
 
 config SYS_CONFIG_NAME
-	string
 	default "imxrt1020-evk"
 
 config IMX_CONFIG
board/freescale/imxrt1050-evk/Kconfig +0 -1
index 79e6e4524ad3..068130beca98 100644
@@ -13,7 +13,6 @@ config SYS_SOC
 	default "imxrt1050"
 
 config SYS_CONFIG_NAME
-	string
 	default "imxrt1050-evk"
 
 config IMX_CONFIG
board/freescale/imxrt1170-evk/Kconfig +0 -1
index c61fc579713d..b433d6e5df0b 100644
@@ -13,7 +13,6 @@ config SYS_SOC
 	default "imxrt1170"
 
 config SYS_CONFIG_NAME
-	string
 	default "imxrt1170-evk"
 
 config IMX_CONFIG
board/kontron/sl-mx6ul/Kconfig +0 -1
index 4e58de209477..782e099cec22 100644
@@ -9,7 +9,6 @@ config SYS_VENDOR
 	default "kontron"
 
 config SYS_CONFIG_NAME
-	string
 	default "kontron-sl-mx6ul"
 
 endif
board/kontron/sl-mx8mm/Kconfig +0 -1
index 9dcf407c867c..1cfe9ee64bd8 100644
@@ -9,7 +9,6 @@ config SYS_VENDOR
 	default "kontron"
 
 config SYS_CONFIG_NAME
-	string
 	default "kontron-sl-mx8mm"
 
 endif
board/samsung/starqltechn/Kconfig +0 -8
index 0eea666d0358..e928cb0ea89b 100644
@@ -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
board/st/stih410-b2260/Kconfig +0 -1
index 590add05feab..441a83cbaea6 100644
@@ -13,7 +13,6 @@ config SYS_SOC
 	default "stih410"
 
 config SYS_CONFIG_NAME
-	string
 	default "stih410-b2260"
 
 endif
board/st/stm32f429-discovery/Kconfig +0 -1
index e73d11bada4f..3c93df20afac 100644
@@ -13,7 +13,6 @@ config SYS_SOC
 	default "stm32f4"
 
 config SYS_CONFIG_NAME
-	string
 	default "stm32f429-discovery"
 
 endif
board/st/stm32f429-evaluation/Kconfig +0 -1
index ca4bb3d9c956..eaa40db8a74a 100644
@@ -13,7 +13,6 @@ config SYS_SOC
 	default "stm32f4"
 
 config SYS_CONFIG_NAME
-	string
 	default "stm32f429-evaluation"
 
 endif
board/st/stm32f469-discovery/Kconfig +0 -1
index de61b6f2f6da..622a8d82d81a 100644
@@ -13,7 +13,6 @@ config SYS_SOC
 	default "stm32f4"
 
 config SYS_CONFIG_NAME
-	string
 	default "stm32f469-discovery"
 
 endif
board/st/stm32f746-disco/Kconfig +0 -1
index 09289d23238e..86ace17377c5 100644
@@ -13,7 +13,6 @@ config SYS_SOC
 	default "stm32f7"
 
 config SYS_CONFIG_NAME
-	string
 	default "stm32f746-disco"
 
 endif
board/st/stm32h743-disco/Kconfig +0 -1
index 7d6ec1d95864..bc116bcf32fa 100644
@@ -13,7 +13,6 @@ config SYS_SOC
 	default "stm32h7"
 
 config SYS_CONFIG_NAME
-	string
 	default "stm32h743-disco"
 
 endif
board/st/stm32h743-eval/Kconfig +0 -1
index ea879b13c8b0..ff86de25f7de 100644
@@ -13,7 +13,6 @@ config SYS_SOC
 	default "stm32h7"
 
 config SYS_CONFIG_NAME
-	string
 	default "stm32h743-eval"
 
 endif
board/st/stm32h750-art-pi/Kconfig +0 -1
index c31b9849fde6..ab2d0f227d72 100644
@@ -13,7 +13,6 @@ config SYS_SOC
 	default "stm32h7"
 
 config SYS_CONFIG_NAME
-	string
 	default "stm32h750-art-pi"
 
 endif
board/sysam/amcore/Kconfig +0 -1
index dd9816ec2435..e13ee8f6e90e 100644
@@ -13,7 +13,6 @@ config SYS_VENDOR
         default "sysam"
 
 config SYS_CONFIG_NAME
-        string
         default "amcore"
 
 endif
board/xilinx/microblaze-generic/Kconfig +0 -8
index dd5eacef52a8..038ff0b61306 100644
@@ -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
Signature · 1 line
2.34.1
author
#21 lore raw
In reply to Tom Rini
Quoted 6 lines · Tom Rini

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.

Applied to u-boot/next, thanks!

Signature · 1 line
Tom