GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mb/google/(guybrush|skyrim): Use a variable for APCB filename 

We use the name of the APCB file repeatedly, so put it into a variable
so that it's easier to update.

Signed-off-by: Martin Roth <martin.roth@amd.corp-partner.google.com>
Change-Id: I8684db2f7b2d68f0354e37bd8cdfc4f9cab44b8a
Reviewed-on: https://review.coreboot.org/c/coreboot/+/67501
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Paul Menzel <paulepanter@mailbox.org>
Reviewed-by: Jason Glenesk <jason.glenesk@amd.corp-partner.google.com>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
This commit is contained in:
Martin Roth 2022-09-09 12:17:10 -06:00 committed by Felix Held
parent 6a342360da
commit 3d242755ef
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/mainboard/google/guybrush/Makefile.inc
View File

@ -22,14 +22,16 @@ subdirs-y += variants/$(VARIANT_DIR)
CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include
CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include
APCB_NAME=APCB_CZN_D4
LIB_SPD_DEPS = $(SPD_SOURCES) LIB_SPD_DEPS = $(SPD_SOURCES)
APCB_SOURCES = $(obj)/APCB_CZN_D4.gen APCB_SOURCES = $(obj)/$(APCB_NAME).gen
APCB_SOURCES_RECOVERY = $(obj)/APCB_CZN_D4.gen APCB_SOURCES_RECOVERY = $(obj)/$(APCB_NAME).gen
$(obj)/APCB_CZN_D4.gen: $(SPD_SOURCES) \ $(obj)/$(APCB_NAME).gen: $(SPD_SOURCES) \
$(APCB_V3_EDIT_TOOL) \ $(APCB_V3_EDIT_TOOL) \
$(MAINBOARD_BLOBS_DIR)/APCB_CZN_D4.bin $(MAINBOARD_BLOBS_DIR)/$(APCB_NAME).bin
$(APCB_V3_EDIT_TOOL) $(MAINBOARD_BLOBS_DIR)/APCB_CZN_D4.bin \ $(APCB_V3_EDIT_TOOL) $(MAINBOARD_BLOBS_DIR)/$(APCB_NAME).bin \
$(obj)/APCB_CZN_D4.gen \ $(obj)/$(APCB_NAME).gen \
--spd_sources $(SPD_SOURCES) --spd_sources $(SPD_SOURCES)

16
src/mainboard/google/skyrim/Makefile.inc
View File

@ -18,21 +18,23 @@ subdirs-y += variants/$(VARIANT_DIR)
CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include
CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include
ifneq ($(wildcard $(MAINBOARD_BLOBS_DIR)/APCB_MDN_D5.bin),) APCB_NAME=APCB_MDN_D5
ifneq ($(wildcard $(MAINBOARD_BLOBS_DIR)/$(APCB_NAME).bin),)
$(info APCB sources present.) $(info APCB sources present.)
ifneq ($(wildcard $(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/memory/Makefile.inc),) ifneq ($(wildcard $(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/memory/Makefile.inc),)
LIB_SPD_DEPS = $(SPD_SOURCES) LIB_SPD_DEPS = $(SPD_SOURCES)
APCB_SOURCES = $(obj)/APCB_MDN_D5.gen APCB_SOURCES = $(obj)/$(APCB_NAME).gen
APCB_SOURCES_RECOVERY = $(obj)/APCB_MDN_D5.gen APCB_SOURCES_RECOVERY = $(obj)/$(APCB_NAME).gen
$(obj)/APCB_MDN_D5.gen: $(SPD_SOURCES) \ $(obj)/$(APCB_NAME).gen: $(SPD_SOURCES) \
$(APCB_V3_EDIT_TOOL) \ $(APCB_V3_EDIT_TOOL) \
$(MAINBOARD_BLOBS_DIR)/APCB_MDN_D5.bin $(MAINBOARD_BLOBS_DIR)/$(APCB_NAME).bin
$(APCB_V3_EDIT_TOOL) $(MAINBOARD_BLOBS_DIR)/APCB_MDN_D5.bin \ $(APCB_V3_EDIT_TOOL) $(MAINBOARD_BLOBS_DIR)/$(APCB_NAME).bin \
$(obj)/APCB_MDN_D5.gen \ $(obj)/$(APCB_NAME).gen \
--spd_sources $(SPD_SOURCES) \ --spd_sources $(SPD_SOURCES) \
--mem_type 'lp5' --mem_type 'lp5'
else else