sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

src, util: Clean up makefile.inc in text, help & comments

Browse Source 
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>
This commit is contained in:
Martin Roth
2024-01-18 19:06:14 -07:00
committed by Felix Held
parent 0825d90467
commit 659f97c621
13 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Kconfig
View File

@@ -1492,7 +1492,7 @@ config MEMLAYOUT_LD_FILE
This variable allows SoC/mainboard to supply in a custom linker file This variable allows SoC/mainboard to supply in a custom linker file
if required. This determines the linker file used for all the stages if required. This determines the linker file used for all the stages
(bootblock, romstage, verstage, ramstage, postcar) in (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 # Set default values for symbols created before mainboards. This allows the

2
src/mainboard/cavium/cn8100_sff_evb/board.fmd
View File

@@ -6,7 +6,7 @@ FLASH@0x0 8M {
FMAP@0x0 0x1000 FMAP@0x0 0x1000
# bootblock includes trusted/non-trusted CLIB, CSIB, # bootblock includes trusted/non-trusted CLIB, CSIB,
# and BL1FWs packaged in # and BL1FWs packaged in
# src/soc/cavium/common/Makefile.inc. # src/soc/cavium/common/Makefile.mk.
BOOTBLOCK@0x10000 0x70000 BOOTBLOCK@0x10000 0x70000
COREBOOT(CBFS)@0x80000 0x77c000 COREBOOT(CBFS)@0x80000 0x77c000
} }

2
src/mainboard/google/glados/variants/asuka/variant.c
View File

@@ -38,6 +38,6 @@ void variant_memory_init_params(FSPM_UPD *mupd, const int spd_index)
int is_dual_channel(const int spd_index) 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); return (spd_index & 0x1);
} }

2
src/mainboard/google/nyan_big/bct/Makefile.mk
View File

@@ -5,5 +5,5 @@ bct-cfg-$(CONFIG_NYAN_BIG_BCT_CFG_SPI) += spi.cfg
bct-cfg-y += odmdata.cfg bct-cfg-y += odmdata.cfg
# Note when SDRAM config (sdram-*.cfg) files are changed, we have to regenerate # 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. # information.

2
src/mainboard/google/nyan_blaze/bct/Makefile.mk
View File

@@ -5,5 +5,5 @@ bct-cfg-$(CONFIG_NYAN_BLAZE_BCT_CFG_SPI) += spi.cfg
bct-cfg-y += odmdata.cfg bct-cfg-y += odmdata.cfg
# Note when SDRAM config (sdram-*.cfg) files are changed, we have to regenerate # 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. # information.

2
src/mainboard/intel/strago/Kconfig
View File

@@ -35,7 +35,7 @@ config VGA_BIOS_ID
default "8086,22b0" default "8086,22b0"
help help
The VGA_BIOS_ID for the C0 version of the video BIOS is hardcoded 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 config CBFS_SIZE
default 0x200000 default 0x200000

2
src/mainboard/opencellular/elgon/board.fmd
View File

@@ -6,7 +6,7 @@ FLASH@0x0 16M {
FMAP@0x0 0x1000 FMAP@0x0 0x1000
# bootblock includes trusted/non-trusted CLIB, CSIB, # bootblock includes trusted/non-trusted CLIB, CSIB,
# and BL1FWs packaged in # and BL1FWs packaged in
# src/soc/cavium/common/Makefile.inc. # src/soc/cavium/common/Makefile.mk.
BOOTBLOCK@0x10000 0x70000 BOOTBLOCK@0x10000 0x70000
COREBOOT(CBFS)@0x80000 0xf7c000 COREBOOT(CBFS)@0x80000 0xf7c000
} }

2
src/mainboard/opencellular/elgon/vboot.fmd
View File

@@ -8,7 +8,7 @@ FLASH@0x0 16M {
RO_FRID@0x1000 0x100 RO_FRID@0x1000 0x100
# bootblock includes trusted/non-trusted CLIB, CSIB, # bootblock includes trusted/non-trusted CLIB, CSIB,
# and BL1FWs packaged in # and BL1FWs packaged in
# src/soc/cavium/common/Makefile.inc. # src/soc/cavium/common/Makefile.mk.
BOOTBLOCK@0x10000 0x70000 BOOTBLOCK@0x10000 0x70000
COREBOOT(CBFS)@0x80000 0x2fc000 COREBOOT(CBFS)@0x80000 0x2fc000
GBB@0x37c000 0x80000 GBB@0x37c000 0x80000

2
src/mainboard/protectli/vault_bsw/Kconfig
View File

@@ -57,7 +57,7 @@ config VGA_BIOS_ID
default "8086,22b0" default "8086,22b0"
help help
The VGA_BIOS_ID for the C0 version of the video bios is hardcoded 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 endif #RUN_FSP_GOP

2
src/mainboard/siemens/mc_apl1/Makefile.mk
View File

@@ -4,7 +4,7 @@ bootblock-y += bootblock.c
# The inclusion of romstage.c is not necessary here. # The inclusion of romstage.c is not necessary here.
# It is put down only to the better understanding. # 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 romstage-y += romstage.c
ramstage-y += mainboard.c ramstage-y += mainboard.c

2
src/sbom/Makefile.mk
View File

@@ -65,7 +65,7 @@ swid-files-$(CONFIG_SBOM_SINIT_ACM) += $(CONFIG_SINIT_ACM_PATH)
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 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) 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) 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) 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)

10
util/kconfig/patches/0008-kconfig-Add-wildcard-support-for-source.patch
View File

@@ -8,7 +8,7 @@ wildcards (e.g. source src/mainboard/*/Kconfig) which
makes automatic inclusion of all boards a tedious task makes automatic inclusion of all boards a tedious task
and prevents us from implementing "drop in" boards. 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 directories per wildcard, so let's add the infrastructure
to do the same with Kconfig. to do the same with Kconfig.
@@ -28,7 +28,7 @@ Index: kconfig/lexer.l
+++ kconfig/lexer.l +++ kconfig/lexer.l
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
%{ %{
#include <assert.h> #include <assert.h>
+#include <glob.h> +#include <glob.h>
#include <limits.h> #include <limits.h>
@@ -37,7 +37,7 @@ Index: kconfig/lexer.l
@@ -439,6 +440,32 @@ void zconf_nextfile(const char *name) @@ -439,6 +440,32 @@ void zconf_nextfile(const char *name)
current_file = file; current_file = file;
} }
+void zconf_nextfiles(const char *wildcard) +void zconf_nextfiles(const char *wildcard)
+{ +{
+ glob_t g; + glob_t g;
@@ -78,7 +78,7 @@ Index: kconfig/lkc.h
+void zconf_nextfiles(const char *name); +void zconf_nextfiles(const char *name);
int zconf_lineno(void); int zconf_lineno(void);
const char *zconf_curname(void); const char *zconf_curname(void);
Index: kconfig/parser.y Index: kconfig/parser.y
=================================================================== ===================================================================
--- kconfig.orig/parser.y --- kconfig.orig/parser.y
@@ -91,4 +91,4 @@ Index: kconfig/parser.y
+ zconf_nextfiles($2); + zconf_nextfiles($2);
free($2); free($2);
}; };

2
util/scripts/rm_unused_code
View File

@@ -259,7 +259,7 @@ remove_kconfigs() {
remove_unused() { remove_unused() {
local dir local dir
# Most files can be removed simply by looking at the time, but # 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. # whether they're used or not.
remove_kconfigs remove_kconfigs