Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/80125?usp=email )
Change subject: src, util: Clean up makefile.inc in text, help & comments ......................................................................
src, util: Clean up makefile.inc in text, help & comments
Signed-off-by: Martin Roth gaumless@gmail.com Change-Id: Ib69236fb5d68272f92405512dc231fa75ecccaa6 Reviewed-on: https://review.coreboot.org/c/coreboot/+/80125 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Felix Singer service+coreboot-gerrit@felixsinger.de Reviewed-by: Felix Held felix-coreboot@felixheld.de --- M src/Kconfig M src/mainboard/cavium/cn8100_sff_evb/board.fmd M src/mainboard/google/glados/variants/asuka/variant.c M src/mainboard/google/nyan_big/bct/Makefile.mk M src/mainboard/google/nyan_blaze/bct/Makefile.mk M src/mainboard/intel/strago/Kconfig M src/mainboard/opencellular/elgon/board.fmd M src/mainboard/opencellular/elgon/vboot.fmd M src/mainboard/protectli/vault_bsw/Kconfig M src/mainboard/siemens/mc_apl1/Makefile.mk M src/sbom/Makefile.mk M util/kconfig/patches/0008-kconfig-Add-wildcard-support-for-source.patch M util/scripts/rm_unused_code 13 files changed, 17 insertions(+), 17 deletions(-)
Approvals: build bot (Jenkins): Verified Felix Held: Looks good to me, approved Felix Singer: Looks good to me, approved
diff --git a/src/Kconfig b/src/Kconfig index 21c50c5..2bcc3ce 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -1492,7 +1492,7 @@ This variable allows SoC/mainboard to supply in a custom linker file if required. This determines the linker file used for all the stages (bootblock, romstage, verstage, ramstage, postcar) in - src/arch/${ARCH}/Makefile.inc. + src/arch/${ARCH}/Makefile.mk.
############################################################################### # Set default values for symbols created before mainboards. This allows the diff --git a/src/mainboard/cavium/cn8100_sff_evb/board.fmd b/src/mainboard/cavium/cn8100_sff_evb/board.fmd index 34f3161..011d070 100644 --- a/src/mainboard/cavium/cn8100_sff_evb/board.fmd +++ b/src/mainboard/cavium/cn8100_sff_evb/board.fmd @@ -6,7 +6,7 @@ FMAP@0x0 0x1000 # bootblock includes trusted/non-trusted CLIB, CSIB, # and BL1FWs packaged in - # src/soc/cavium/common/Makefile.inc. + # src/soc/cavium/common/Makefile.mk. BOOTBLOCK@0x10000 0x70000 COREBOOT(CBFS)@0x80000 0x77c000 } diff --git a/src/mainboard/google/glados/variants/asuka/variant.c b/src/mainboard/google/glados/variants/asuka/variant.c index 68392fe..2dca9b0 100644 --- a/src/mainboard/google/glados/variants/asuka/variant.c +++ b/src/mainboard/google/glados/variants/asuka/variant.c @@ -38,6 +38,6 @@
int is_dual_channel(const int spd_index) { - /* Per Makefile.inc, dual channel indices 1,3,5 */ + /* Per Makefile.mk, dual channel indices 1,3,5 */ return (spd_index & 0x1); } diff --git a/src/mainboard/google/nyan_big/bct/Makefile.mk b/src/mainboard/google/nyan_big/bct/Makefile.mk index f83c932..9f65647 100644 --- a/src/mainboard/google/nyan_big/bct/Makefile.mk +++ b/src/mainboard/google/nyan_big/bct/Makefile.mk @@ -5,5 +5,5 @@ bct-cfg-y += odmdata.cfg
# Note when SDRAM config (sdram-*.cfg) files are changed, we have to regenerate -# the include files (sdram-*.inc). See ../../nyan/bct/Makefile.inc for more +# the include files (sdram-*.inc). See ../../nyan/bct/Makefile.mk for more # information. diff --git a/src/mainboard/google/nyan_blaze/bct/Makefile.mk b/src/mainboard/google/nyan_blaze/bct/Makefile.mk index 02f32a59..86fcfc4 100644 --- a/src/mainboard/google/nyan_blaze/bct/Makefile.mk +++ b/src/mainboard/google/nyan_blaze/bct/Makefile.mk @@ -5,5 +5,5 @@ bct-cfg-y += odmdata.cfg
# Note when SDRAM config (sdram-*.cfg) files are changed, we have to regenerate -# the include files (sdram-*.inc). See ../../nyan/bct/Makefile.inc for more +# the include files (sdram-*.inc). See ../../nyan/bct/Makefile.mk for more # information. diff --git a/src/mainboard/intel/strago/Kconfig b/src/mainboard/intel/strago/Kconfig index 5cd7880..ce56cc6 100644 --- a/src/mainboard/intel/strago/Kconfig +++ b/src/mainboard/intel/strago/Kconfig @@ -35,7 +35,7 @@ default "8086,22b0" help The VGA_BIOS_ID for the C0 version of the video BIOS is hardcoded - in soc/intel/braswell/Makefile.inc as 8086,22b1 + in soc/intel/braswell/Makefile.mk as 8086,22b1
config CBFS_SIZE default 0x200000 diff --git a/src/mainboard/opencellular/elgon/board.fmd b/src/mainboard/opencellular/elgon/board.fmd index 784f3b0..222490c 100644 --- a/src/mainboard/opencellular/elgon/board.fmd +++ b/src/mainboard/opencellular/elgon/board.fmd @@ -6,7 +6,7 @@ FMAP@0x0 0x1000 # bootblock includes trusted/non-trusted CLIB, CSIB, # and BL1FWs packaged in - # src/soc/cavium/common/Makefile.inc. + # src/soc/cavium/common/Makefile.mk. BOOTBLOCK@0x10000 0x70000 COREBOOT(CBFS)@0x80000 0xf7c000 } diff --git a/src/mainboard/opencellular/elgon/vboot.fmd b/src/mainboard/opencellular/elgon/vboot.fmd index 0d6af2d..77ef10d 100644 --- a/src/mainboard/opencellular/elgon/vboot.fmd +++ b/src/mainboard/opencellular/elgon/vboot.fmd @@ -8,7 +8,7 @@ RO_FRID@0x1000 0x100 # bootblock includes trusted/non-trusted CLIB, CSIB, # and BL1FWs packaged in - # src/soc/cavium/common/Makefile.inc. + # src/soc/cavium/common/Makefile.mk. BOOTBLOCK@0x10000 0x70000 COREBOOT(CBFS)@0x80000 0x2fc000 GBB@0x37c000 0x80000 diff --git a/src/mainboard/protectli/vault_bsw/Kconfig b/src/mainboard/protectli/vault_bsw/Kconfig index e169392..63fc710 100644 --- a/src/mainboard/protectli/vault_bsw/Kconfig +++ b/src/mainboard/protectli/vault_bsw/Kconfig @@ -57,7 +57,7 @@ default "8086,22b0" help The VGA_BIOS_ID for the C0 version of the video bios is hardcoded - in soc/intel/braswell/Makefile.inc as 8086,22b1 + in soc/intel/braswell/Makefile.mk as 8086,22b1
endif #RUN_FSP_GOP
diff --git a/src/mainboard/siemens/mc_apl1/Makefile.mk b/src/mainboard/siemens/mc_apl1/Makefile.mk index e179201..37b6c74 100644 --- a/src/mainboard/siemens/mc_apl1/Makefile.mk +++ b/src/mainboard/siemens/mc_apl1/Makefile.mk @@ -4,7 +4,7 @@
# The inclusion of romstage.c is not necessary here. # It is put down only to the better understanding. -# The file is already included over src/arch/x86/Makefile.inc. +# The file is already included over src/arch/x86/Makefile.mk. romstage-y += romstage.c
ramstage-y += mainboard.c diff --git a/src/sbom/Makefile.mk b/src/sbom/Makefile.mk index 7783f09..4e3adc2 100644 --- a/src/sbom/Makefile.mk +++ b/src/sbom/Makefile.mk @@ -65,7 +65,7 @@
vboot-pkgconfig-files = $(obj)/external/vboot_reference-bootblock/vboot_host.pc $(obj)/external/vboot_reference-romstage/vboot_host.pc $(obj)/external/vboot_reference-ramstage/vboot_host.pc $(obj)/external/vboot_reference-postcar/vboot_host.pc swid-files-$(CONFIG_SBOM_VBOOT) += $(vboot-pkgconfig-files) -$(vboot-pkgconfig-files): $(VBOOT_LIB_bootblock) $(VBOOT_LIB_romstage) $(VBOOT_LIB_ramstage) $(VBOOT_LIB_postcar) # src/security/vboot/Makefile.inc +$(vboot-pkgconfig-files): $(VBOOT_LIB_bootblock) $(VBOOT_LIB_romstage) $(VBOOT_LIB_ramstage) $(VBOOT_LIB_postcar) # src/security/vboot/Makefile.mk
ifeq ($(CONFIG_SBOM_COMPILER),y) compiler-toolchain = $(CC_bootblock) $(CC_romstage) $(CC_ramstage) $(CC_postcar) $(CC_verstage) $(LD_bootblock) $(LD_romstage) $(LD_ramstage) $(LD_postcar) $(LD_verstage) $(AS_bootblock) $(AS_romstage) $(AS_ramstage) $(AS_postcar) $(AS_verstage) diff --git a/util/kconfig/patches/0008-kconfig-Add-wildcard-support-for-source.patch b/util/kconfig/patches/0008-kconfig-Add-wildcard-support-for-source.patch index 688b387..b476bc1 100644 --- a/util/kconfig/patches/0008-kconfig-Add-wildcard-support-for-source.patch +++ b/util/kconfig/patches/0008-kconfig-Add-wildcard-support-for-source.patch @@ -8,7 +8,7 @@ makes automatic inclusion of all boards a tedious task and prevents us from implementing "drop in" boards.
-In our Makefile.inc files we already include mainboard +In our Makefile.mk files we already include mainboard directories per wildcard, so let's add the infrastructure to do the same with Kconfig.
@@ -28,7 +28,7 @@ +++ kconfig/lexer.l @@ -8,6 +8,7 @@ %{ - + #include <assert.h> +#include <glob.h> #include <limits.h> @@ -37,7 +37,7 @@ @@ -439,6 +440,32 @@ void zconf_nextfile(const char *name) current_file = file; } - + +void zconf_nextfiles(const char *wildcard) +{ + glob_t g; @@ -78,7 +78,7 @@ +void zconf_nextfiles(const char *name); int zconf_lineno(void); const char *zconf_curname(void); - + Index: kconfig/parser.y =================================================================== --- kconfig.orig/parser.y @@ -91,4 +91,4 @@ + zconf_nextfiles($2); free($2); }; - + diff --git a/util/scripts/rm_unused_code b/util/scripts/rm_unused_code index 53c0b65..d4b42b6 100755 --- a/util/scripts/rm_unused_code +++ b/util/scripts/rm_unused_code @@ -259,7 +259,7 @@ remove_unused() { local dir # Most files can be removed simply by looking at the time, but - # all Kconfig and Makefile.inc files in the entire tree are accessed + # all Kconfig and Makefiles in the entire tree are accessed # whether they're used or not. remove_kconfigs