summaryrefslogtreecommitdiff
path: root/src/soc/amd
diff options
context:
space:
mode:
authorRob Barnes <robbarnes@google.com>2020-09-09 13:19:09 -0600
committerAaron Durbin <adurbin@chromium.org>2020-09-10 20:26:03 +0000
commitb2545cc3c6388d0328ce24a81df104a6d069e952 (patch)
tree91e6b81202dc65bd9958f785b5dbc6575258a62b /src/soc/amd
parent3992da034f9f8a52df87202f7caa7056388f97d2 (diff)
downloadcoreboot-b2545cc3c6388d0328ce24a81df104a6d069e952.tar.xz
soc/amd/picasso: Move APCB generation out of picasso
Move APCB generation out of the picasso makefile and into the mainboard makefile. APCB generation tends to be mainboard specific and does not belong in the soc makefile. BUG=b:168099242 TEST=Build mandolin and check for APCB in coreboot binary Build and boot ezkinil Change-Id: Ib85ad94e515f2ffad58aafe06c1f1d4043e9303c Signed-off-by: Rob Barnes <robbarnes@google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/45222 Reviewed-by: Raul Rangel <rrangel@chromium.org> Reviewed-by: Martin Roth <martinroth@google.com> Reviewed-by: Felix Held <felix-coreboot@felixheld.de> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc/amd')
-rw-r--r--src/soc/amd/picasso/Makefile.inc25
1 files changed, 2 insertions, 23 deletions
diff --git a/src/soc/amd/picasso/Makefile.inc b/src/soc/amd/picasso/Makefile.inc
index f4ec6c990d..eb2be5040f 100644
--- a/src/soc/amd/picasso/Makefile.inc
+++ b/src/soc/amd/picasso/Makefile.inc
@@ -198,7 +198,7 @@ endif
#
# type = 0x60
-PSP_APCB_FILES=$(foreach f, $(basename $(SPD_SOURCES)), $(obj)/APCB_$(f).bin)
+PSP_APCB_FILES=$(APCB_SOURCES)
# type = 0x61
PSP_APOB_BASE=$(CONFIG_PSP_APOB_DRAM_ADDRESS)
@@ -383,28 +383,6 @@ AMDFW_COMMON_ARGS=$(OPT_AMD_PUBKEY_FILE) \
--soc-name "Picasso" \
--flashsize $(CONFIG_ROM_SIZE)
-# Copy prebuild APCBs if they exist
-$(obj)/APCB_%.bin: $(MAINBOARD_BLOBS_DIR)/APCB_%.bin
- cp $< $@
-
-# APCB binary with magic numbers to be replaced by apcb_edit tool
-APCB_MAGIC_BLOB:=$(FIRMWARE_LOCATE)/APCB_magic.bin
-
-$(obj)/APCB_%.bin: $$(SPD_SOURCES_DIR)/%.hex \
- $(APCB_EDIT_TOOL) \
- $(APCB_MAGIC_BLOB)
- $(APCB_EDIT_TOOL) \
- $(APCB_MAGIC_BLOB) \
- $@ \
- --hex \
- --strip_manufacturer_information \
- --spd_0_0 $< \
- $(if $(APCB_POPULATE_2ND_CHANNEL), --spd_1_0 $<, ) \
- --board_id_gpio0 $(APCB_BOARD_ID_GPIO0) \
- --board_id_gpio1 $(APCB_BOARD_ID_GPIO1) \
- --board_id_gpio2 $(APCB_BOARD_ID_GPIO2) \
- --board_id_gpio3 $(APCB_BOARD_ID_GPIO3)
-
$(obj)/amdfw.rom: $(call strip_quotes, $(CONFIG_AMD_PUBKEY_FILE)) \
$(call strip_quotes, $(PSPBTLDR_FILE)) \
$(call strip_quotes, $(PSPSCUREOS_FILE)) \
@@ -443,6 +421,7 @@ $(obj)/amdfw.rom: $(call strip_quotes, $(CONFIG_AMD_PUBKEY_FILE)) \
$$(PSP_APCB_FILES) \
$(AMDFWTOOL) \
$(obj)/fmap.fmd
+ $(if $(PSP_APCB_FILES), ,$(error APCB_SOURCES is not set))
rm -f $@
@printf " AMDFWTOOL $(subst $(obj)/,,$(@))\n"
$(AMDFWTOOL) \