kbuild: Allow for CONFIG_SYS_CONFIG_NAME to be unset
Subsystems (10)
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
@@ -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
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
@@ -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
@@ -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
@@ -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
Re: [PATCH 02/16] xilinx_mbv: Remove empty config header
Quoted 43 lines · Tom Rini
Now that we support having
CONFIG_SYS_CONFIG_NAMEbe unset to indicate a lack ofboard.hfile, unset this on thexilinx_mbvplatforms and remove the otherwise empty file.Signed-off-by Tom Rini <[email protected]>---
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.hboard/xilinx/mbv/Kconfig +0
-3@@ -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_RV32Iboard/xilinx/mbv/MAINTAINERS +0
-1@@ -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.hinclude/configs/xilinx_mbv.h deleted +0
-0
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
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_NAMEbe unset to indicate a lack ofboard.hfile, unset this on thexilinx_mbvplatforms and remove the otherwise empty file.Signed-off-by Tom Rini <[email protected]>---
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.hboard/xilinx/mbv/Kconfig +0
-3@@ -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_RV32Iboard/xilinx/mbv/MAINTAINERS +0
-1@@ -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.hinclude/configs/xilinx_mbv.h deleted +0
-0include/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]> -*/ Acked-by 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
Michal Simek
maintainerRe: [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_NAMEbe unset to indicate a lack ofboard.hfile, unset this on thexilinx_mbvplatforms and remove the otherwise empty file.Signed-off-by Tom Rini <[email protected]>---
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.hboard/xilinx/mbv/Kconfig +0
-3@@ -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_RV32Iboard/xilinx/mbv/MAINTAINERS +0
-1@@ -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.hinclude/configs/xilinx_mbv.h deleted +0
-0include/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]> -*/ Acked-by 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
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_NAMEbe unset to indicate a lack ofboard.hfile, unset this on thexilinx_mbvplatforms and remove the otherwise empty file.Signed-off-by Tom Rini <[email protected]>---
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.hboard/xilinx/mbv/Kconfig +0
-3@@ -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_RV32Iboard/xilinx/mbv/MAINTAINERS +0
-1@@ -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.hinclude/configs/xilinx_mbv.h deleted +0
-0include/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]> -*/ Acked-by 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
PATCH 3/16 coreboot: Remove empty config header
In reply to Tom RiniNow 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
@@ -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
@@ -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
@@ -1,4 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* -* Copyright (C) 2018, Bin Meng <[email protected]> -*/
Signature · 1 line
2.34.1
PATCH 4/16 bayleybay: Remove empty config header
In reply to Tom RiniNow 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
@@ -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
@@ -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
@@ -1,4 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* -* Copyright (C) 2015, Bin Meng <[email protected]> -*/
Signature · 1 line
2.34.1
PATCH 5/16 cherryhill: Remove empty config header
In reply to Tom RiniNow 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
@@ -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
@@ -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
@@ -1,4 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* -* Copyright (C) 2017, Bin Meng <[email protected]> -*/
Signature · 1 line
2.34.1
PATCH 6/16 cougarcanyon2: Remove empty config header
In reply to Tom RiniNow 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
@@ -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
@@ -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
@@ -1,4 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* -* Copyright (C) 2016, Bin Meng <[email protected]> -*/
Signature · 1 line
2.34.1
PATCH 7/16 crownbay: Remove empty config header
In reply to Tom RiniNow 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
@@ -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
@@ -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
@@ -1,4 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* -* Copyright (C) 2014, Bin Meng <[email protected]> -*/
Signature · 1 line
2.34.1
PATCH 8/16 edison: Remove empty config header
In reply to Tom RiniNow 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
@@ -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
@@ -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
@@ -1,4 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* -* Copyright (c) 2017 Intel Corp. -*/
Signature · 1 line
2.34.1
Re: [PATCH 08/16] edison: Remove empty config header
Quoted 3 lines · Tom Rini
Now that we support having
CONFIG_SYS_CONFIG_NAMEbe unset to indicate a lack ofboard.hfile, unset this on the edison platform and remove the otherwise empty file.
Signature · 2 lines
With Best Regards, Andy Shevchenko
PATCH 9/16 efi-x86_app: Remove empty config header
In reply to Tom RiniNow 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
@@ -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
@@ -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
@@ -1,4 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* -* Copyright (c) 2015 Google, Inc -*/
Signature · 1 line
2.34.1
PATCH 10/16 efi-x86_payload: Remove empty config header
In reply to Tom RiniNow 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
@@ -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
@@ -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
@@ -1,4 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* -* Copyright (C) 2018, Bin Meng <[email protected]> -*/
Signature · 1 line
2.34.1
PATCH 11/16 galileo: Remove empty config header
In reply to Tom RiniNow 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
@@ -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
@@ -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
@@ -1,4 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* -* Copyright (C) 2015, Bin Meng <[email protected]> -*/
Signature · 1 line
2.34.1
PATCH 12/16 minnowmax: Remove empty config header
In reply to Tom RiniNow 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
@@ -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
@@ -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
@@ -1,4 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* -* Copyright (C) 2015 Google, Inc -*/
Signature · 1 line
2.34.1
PATCH 13/16 qemu-x86*: Remove empty config header
In reply to Tom RiniNow 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
@@ -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
@@ -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
@@ -1,4 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* -* Copyright (C) 2015, Bin Meng <[email protected]> -*/
Signature · 1 line
2.34.1
PATCH 14/16 slimbootloader: Remove empty config header
In reply to Tom RiniNow 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
@@ -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
@@ -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
@@ -1,4 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* -* Copyright (C) 2019 Intel Corporation <www.intel.com> -*/
Signature · 1 line
2.34.1
PATCH 15/16 hc2910-2aghd05: Remove empty config header
In reply to Tom RiniNow 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
@@ -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
@@ -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
@@ -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
PATCH 16/16 Kconfig: Centralize prompting for SYS_CONFIG_NAME
In reply to Tom RiniGenerally 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -13,7 +13,6 @@ config SYS_VENDOR default "sysam" config SYS_CONFIG_NAME - string default "amcore" endif
board/xilinx/microblaze-generic/Kconfig +0 -8
@@ -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
Quoted 6 lines · Tom Rini
It is possible to have a platform which does not require a
board.hfile to build, but today we need an empty one for our generatedconfig.hfile to be valid. Allow for omitting this file ifCONFIG_SYS_CONFIG_NAMEis not set.
Applied to u-boot/next, thanks!
Signature · 1 line
Tom