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>
This commit is contained in:
		@@ -1492,7 +1492,7 @@ config MEMLAYOUT_LD_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
 | 
			
		||||
	  (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
 | 
			
		||||
 
 | 
			
		||||
@@ -6,7 +6,7 @@ FLASH@0x0 8M {
 | 
			
		||||
			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
 | 
			
		||||
		}
 | 
			
		||||
 
 | 
			
		||||
@@ -38,6 +38,6 @@ void variant_memory_init_params(FSPM_UPD *mupd, 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);
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -5,5 +5,5 @@ bct-cfg-$(CONFIG_NYAN_BIG_BCT_CFG_SPI) += spi.cfg
 | 
			
		||||
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.
 | 
			
		||||
 
 | 
			
		||||
@@ -5,5 +5,5 @@ bct-cfg-$(CONFIG_NYAN_BLAZE_BCT_CFG_SPI) += spi.cfg
 | 
			
		||||
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.
 | 
			
		||||
 
 | 
			
		||||
@@ -35,7 +35,7 @@ config VGA_BIOS_ID
 | 
			
		||||
	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
 | 
			
		||||
 
 | 
			
		||||
@@ -6,7 +6,7 @@ FLASH@0x0 16M {
 | 
			
		||||
			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
 | 
			
		||||
		}
 | 
			
		||||
 
 | 
			
		||||
@@ -8,7 +8,7 @@ FLASH@0x0 16M {
 | 
			
		||||
			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
 | 
			
		||||
 
 | 
			
		||||
@@ -57,7 +57,7 @@ config VGA_BIOS_ID
 | 
			
		||||
	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
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -4,7 +4,7 @@ bootblock-y += bootblock.c
 | 
			
		||||
 | 
			
		||||
# 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
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
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)
 | 
			
		||||
 
 | 
			
		||||
@@ -8,7 +8,7 @@ wildcards (e.g. source src/mainboard/*/Kconfig) which
 | 
			
		||||
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.
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -259,7 +259,7 @@ remove_kconfigs() {
 | 
			
		||||
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
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user