summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Papageorge <matthewpapa07@gmail.com>2021-02-22 19:36:34 -0600
committerMartin Roth <martinroth@google.com>2021-03-10 23:28:19 +0000
commita37ec522e121550245d64cc8ac76cbf4c19c96ce (patch)
treee36826f336bdda1076a6c23d1ff017253eebe54d
parentd3a767f47ef4de8a995d60df196ba4a3a399847c (diff)
downloadcoreboot-a37ec522e121550245d64cc8ac76cbf4c19c96ce.tar.xz
mb/amd/majolica: Update to use proper APCBs built for Majolica
Some of the previous binaries were incorrect and should not be used for Majolica because they are templates instead of APCBs specifically built for the board. This APCB update also places the UMA region under 4G and size 32 MB which is essential for video output. TEST=Boot with UEFI BIOS and verify we can get to OS. Also verify memory region size, base and alignment. Change-Id: Id797e2ad5bd67815c09752aedc19dad7dcf8ad12 Signed-off-by: Matt Papageorge <matthewpapa07@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/51014 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Martin Roth <martinroth@google.com>
m---------3rdparty/blobs0
-rw-r--r--src/mainboard/amd/majolica/Makefile.inc3
-rw-r--r--src/soc/amd/cezanne/Makefile.inc2
3 files changed, 2 insertions, 3 deletions
diff --git a/3rdparty/blobs b/3rdparty/blobs
-Subproject 02ab6c66480ccd5f6bdfddd6fa090156d436fa4
+Subproject 4fdfa1c797c9c970073c6de23984a7be716ba94
diff --git a/src/mainboard/amd/majolica/Makefile.inc b/src/mainboard/amd/majolica/Makefile.inc
index a1a6b8a295..3a9f367eee 100644
--- a/src/mainboard/amd/majolica/Makefile.inc
+++ b/src/mainboard/amd/majolica/Makefile.inc
@@ -3,8 +3,7 @@
bootblock-y += bootblock.c
bootblock-y += early_gpio.c
-APCB_SOURCES = $(MAINBOARD_BLOBS_DIR)/APCB_CZN_D4_Updatable.bin
-APCB_SOURCES_68 = $(MAINBOARD_BLOBS_DIR)/APCB_CZN_D4_Updatable_68.bin
+APCB_SOURCES = $(MAINBOARD_BLOBS_DIR)/APCB_CZN_D4.bin
APCB_SOURCES_RECOVERY = $(MAINBOARD_BLOBS_DIR)/APCB_CZN_D4_DefaultRecovery.bin
ifeq ($(CONFIG_MAJOLICA_HAVE_MCHP_FW),y)
diff --git a/src/soc/amd/cezanne/Makefile.inc b/src/soc/amd/cezanne/Makefile.inc
index d58321ddfb..aa82c99ba4 100644
--- a/src/soc/amd/cezanne/Makefile.inc
+++ b/src/soc/amd/cezanne/Makefile.inc
@@ -97,7 +97,7 @@ endif
#
# type = 0x60
-PSP_APCB_FILES=$(APCB_SOURCES) $(APCB_SOURCES_68) $(APCB_SOURCES_RECOVERY)
+PSP_APCB_FILES=$(APCB_SOURCES) $(APCB_SOURCES_RECOVERY)
# type = 0x61
PSP_APOB_BASE=$(CONFIG_PSP_APOB_DRAM_ADDRESS)