From 95d05d8301627312b2e5afd4ba6a10061bc11354 Mon Sep 17 00:00:00 2001
From: Matt DeVillier <matt.devillier@amd.corp-partner.google.com>
Date: Fri, 15 Dec 2023 15:50:35 -0600
Subject: [PATCH] mb/google/zork: Add and use APCB configuration data

This file is identical to the copy currently found in the amd_blobs
repository; it is simply being relocated since it is mainboard specific
and does not need to be in an external repo.

BUG=none
TEST=build/boot morphius

Change-Id: Ia78fcd065fbf4d5ba6ec4edc3f8f937badf66ecc
Signed-off-by: Matt DeVillier <matt.devillier@amd.corp-partner.google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/79591
Reviewed-by: Martin Roth <martin.roth@amd.corp-partner.google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/mainboard/google/zork/data.apcb        | Bin 0 -> 4672 bytes
 src/mainboard/google/zork/spd/Makefile.inc |   7 ++++---
 2 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 src/mainboard/google/zork/data.apcb

diff --git a/src/mainboard/google/zork/data.apcb b/src/mainboard/google/zork/data.apcb
new file mode 100644
index 0000000000000000000000000000000000000000..f7a3e7817e7e3ae0c4d5e5ce34a1ca2ac5dd453b
GIT binary patch
literal 4672
zcmeH~y>A>v6u{ry&fc!?Y)=vrHgQaRF(ytz0LKL9gMcq~$k9X`F)Kj;VJV;!0+a?(
zMIwa@I$BZ@MOHeb)KnJY51^nWe*-nm@_Vzp_GT|GK!V0M*6-e%x9`3A^l0Wve|4oJ
z9qAqr2_JuxF3OXozt-=WWS<z!>tK>~=~r9=`Rnl?Kb1HUXN+q!To5>GT^PD%(?yYs
zV>dSDS}oUZyYX>1G2tdBox}a=wO%JE@^6thNJ4qPlHZs>OalV25JD3oh+zy`x5Ttz
zJP^rdB+&9(gojA{sV2+F+x$=RUVrO)&ldgvo$=Ttk}q|#iegMe{|EFREP4n{h#-bB
zXhC~G|B(|g2@dwbemDTn%!@gMe0IPZAP*ytz!dsXn1<)z7|cKij>9ZG4|DJWoPc>a
z38&!nyqFi^47>y{M`B)q1vm?fZ~-pDrGc2&k>}wuyb9-F30{L`cmv*qZsga(PsJn4
z#wq?p8oHjkHX>VDCem$sU5xswn>2F6_OE_1$F{4g7y@k)kLLP+o9hMHh<BEN70nk6
zdA~60n)>xd{u%zfzc7!)9-e{CV(dG6!;JRE9^Mbtp+Bha4Gxddxlx^=y{kVQ+8d*D
zWAE;UeB?GcD+`rL(7VR{EX(wExap;l2e~v4kv8edor-_d#^_%Y7)?}E8l@6cKU=Gb
zV*Rb(Mk^V2S8dXlx!UKu)cqy5u-oK@sI6KysQhqAyj{m<3-pfc@5!mz%9hjg7WM3%
zH2qBFCuurRc{@!%SNUz4exdUFH2q5Dk7;^aWtPXG`eKu{q50JI@4`^KYD+$lN64}q
zFBO%=EM2MFxHIy!94ZHgEF!bm8bzLRo>po$wa*nc^)3Cb)@*9G$xZncds#4vychaA
zsy5^6<wqnBQs-?9UL~UDv$W&W&+}A$%6!{-B!4&Sy6LwP)SW!i^+PE8Q}?mShjOq?
zT;$M>si}<7d|I>}eI+R^xCw{Bhd*UZ+IMBwnEs)swi6PwT%h@%Xs3wLyk)n`c6N=a
z%>kjl?ADG=KC10o|7s+r+q@Uwi}RYcp4V;i@jvpvw)%FjS-k1LBTF-B%VpoA{KuGS
zP7w&eLI}+}94XWMlg$*KztD}0*ztcIySlR0i;8}1k~K;u<m+lbn0#{trr_whm|5fr
zI1OhyyycM`m}U|E94x_k>hHo0SR)zzWdnB5E>7`}8Uz>2mTZX5Jx^@fbp9i%FXkk1
Kr%*MH)AVm5zrFzg

literal 0
HcmV?d00001

diff --git a/src/mainboard/google/zork/spd/Makefile.inc b/src/mainboard/google/zork/spd/Makefile.inc
index 4ae310ae84..3e6509d9ae 100644
--- a/src/mainboard/google/zork/spd/Makefile.inc
+++ b/src/mainboard/google/zork/spd/Makefile.inc
@@ -5,13 +5,14 @@ SPD_SOURCES_DIR=$(dir $(word 1, $(SPD_SOURCES)))
 APCB_SOURCES=$(foreach f, $(basename $(notdir $(SPD_SOURCES))), $(obj)/APCB_$(f).gen)
 
 # APCB binary with magic numbers to be replaced by apcb_edit tool
-APCB_MAGIC_BLOB:=$(FIRMWARE_LOCATION)/APCB_magic.bin
+APCB_NAME=data.apcb
+APCB_PATH=$(src)/mainboard/$(MAINBOARDDIR)
 
 $(obj)/APCB_%.gen:	$(SPD_SOURCES_DIR)%.hex \
 			$(APCB_EDIT_TOOL) \
-			$(APCB_MAGIC_BLOB)
+			$(APCB_PATH)/$(APCB_NAME)
 	$(APCB_EDIT_TOOL) \
-	$(APCB_MAGIC_BLOB) \
+	$(APCB_PATH)/$(APCB_NAME) \
 	$@ \
 	--hex \
 	--strip_manufacturer_information \