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

Myst: Update Makefile to remove SPD injection 

The SPD format in the APCB has changed for Phoenix, and the injection
tool 'apcbtool' needs to be updated to match. Until this happens, the
APCB will be built containing the correct SPD.

BUG=b:281983434
TEST=Build

Signed-off-by: Martin Roth <gaumless@gmail.com>
Change-Id: If575f98511c796e93c5a12cd450a3a7985e39806
Reviewed-on: https://review.coreboot.org/c/coreboot/+/75143
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Jon Murphy <jpmurphy@google.com>
This commit is contained in:
Martin Roth 2023-05-11 15:00:40 -06:00 committed by Martin L Roth
parent fb03140757
commit dd4fa8e603
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/mainboard/google/myst/Makefile.inc
View File

@ -20,23 +20,30 @@ APCB_NAME=APCB_PHX_D5
ifneq ($(wildcard $(MAINBOARD_BLOBS_DIR)/$(APCB_NAME).bin),) 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),) APCB_SOURCES = $(MAINBOARD_BLOBS_DIR)/$(APCB_NAME).bin
LIB_SPD_DEPS = $(SPD_SOURCES) # The SPD is currently built directly into the APCB.
# Add the below section back in after the apcbtool is updated to handle the
# Phoenix APCB SPD configuration.
APCB_SOURCES = $(obj)/$(APCB_NAME).gen #ifneq ($(wildcard $(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/memory/Makefile.inc),)
#
#LIB_SPD_DEPS = $(SPD_SOURCES)
#
#APCB_SOURCES = $(obj)/$(APCB_NAME).gen
#
#$(obj)/$(APCB_NAME).gen: $(SPD_SOURCES) \
# $(APCB_V3_EDIT_TOOL) \
# $(MAINBOARD_BLOBS_DIR)/$(APCB_NAME).bin
# $(APCB_V3_EDIT_TOOL) $(MAINBOARD_BLOBS_DIR)/$(APCB_NAME).bin \
# $(obj)/$(APCB_NAME).gen \
# --spd_sources $(SPD_SOURCES) \
# --mem_type 'lp5'
#else
#$(info SPD sources not found. Skipping APCB.)
#files_added:: die_no_apcb
#endif
$(obj)/$(APCB_NAME).gen: $(SPD_SOURCES) \
$(APCB_V3_EDIT_TOOL) \
$(MAINBOARD_BLOBS_DIR)/$(APCB_NAME).bin
$(APCB_V3_EDIT_TOOL) $(MAINBOARD_BLOBS_DIR)/$(APCB_NAME).bin \
$(obj)/$(APCB_NAME).gen \
--spd_sources $(SPD_SOURCES) \
--mem_type 'lp5'
else
$(info SPD sources not found. Skipping APCB.)
files_added:: die_no_apcb
endif
else else
$(info APCB sources not found. Skipping APCB.) $(info APCB sources not found. Skipping APCB.)
files_added:: warn_no_apcb files_added:: warn_no_apcb