[S] Change in coreboot[main]: mb/google/zork: Add Kconfig to set IGD UMA allocation via APCB

[Felix Held (Code Review)]

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/84237?usp=email )

Change subject: mb/google/zork: Add Kconfig to set IGD UMA allocation via APCB
......................................................................

mb/google/zork: Add Kconfig to set IGD UMA allocation via APCB

Add a Kconfig choice to select the IGD UMA allocation, which selects a
precompiled ACPB binary with the corresponding UMA value set. Default
to the previous value (128MB) for non-ChromeOS builds, and 64MB for
ChromeOS as that is the value used there.

TEST=build/boot google/morphius, verify UMA size changes with selection
via dxdiag tool under Windows.

Change-Id: I6debd10527c33ce37ef3ada20955c8f7b7500039
Signed-off-by: Matt DeVillier 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/84237
Reviewed-by: Felix Held 
Tested-by: build bot (Jenkins) 
---
M src/mainboard/google/zork/Kconfig
D src/mainboard/google/zork/data.apcb
M src/mainboard/google/zork/spd/Makefile.mk
A src/mainboard/google/zork/uma_128.apcb
A src/mainboard/google/zork/uma_256.apcb
A src/mainboard/google/zork/uma_512.apcb
A src/mainboard/google/zork/uma_64.apcb
7 files changed, 31 insertions(+), 1 deletion(-)

Approvals:
  build bot (Jenkins): Verified
  Felix Held: Looks good to me, approved

diff --git a/src/mainboard/google/zork/Kconfig b/src/mainboard/google/zork/Kconfig
index 1fcd06b..1b38d27 100644
--- a/src/mainboard/google/zork/Kconfig
+++ b/src/mainboard/google/zork/Kconfig
@@ -301,4 +301,25 @@
    select SAR_ENABLE
    select USE_SAR

+choice
+	prompt "UMA Memory Allocation"
+	default ZORK_UMA_SIZE_64MB if CHROMEOS
+	default ZORK_UMA_SIZE_128MB
+	help
+	  The amount of system memory allocated for the integrated GPU.
+
+config ZORK_UMA_SIZE_64MB
+	bool "64MB"
+
+config ZORK_UMA_SIZE_128MB
+	bool "128MB"
+
+config ZORK_UMA_SIZE_256MB
+	bool "256MB"
+
+config ZORK_UMA_SIZE_512MB
+	bool "512MB"
+
+endchoice
+
 endif # BOARD_GOOGLE_BASEBOARD_TREMBYLE || BOARD_GOOGLE_BASEBOARD_DALBOZ
diff --git a/src/mainboard/google/zork/spd/Makefile.mk b/src/mainboard/google/zork/spd/Makefile.mk
index 3e6509d..1f0b20c 100644
--- a/src/mainboard/google/zork/spd/Makefile.mk
+++ b/src/mainboard/google/zork/spd/Makefile.mk
@@ -5,7 +5,16 @@
 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_NAME=data.apcb
+ifeq ($(CONFIG_ZORK_UMA_SIZE_64MB),y)
+APCB_NAME=uma_64.apcb
+else ifeq ($(CONFIG_ZORK_UMA_SIZE_128MB),y)
+APCB_NAME=uma_128.apcb
+else ifeq ($(CONFIG_ZORK_UMA_SIZE_256MB),y)
+APCB_NAME=uma_256.apcb
+else ifeq ($(CONFIG_ZORK_UMA_SIZE_512MB),y)
+APCB_NAME=uma_512.apcb
+endif
+
 APCB_PATH=$(src)/mainboard/$(MAINBOARDDIR)

$(obj)/APCB_%.gen:	$(SPD_SOURCES_DIR)%.hex \
diff --git a/src/mainboard/google/zork/data.apcb b/src/mainboard/google/zork/uma_128.apcb
similarity index 97%
rename from src/mainboard/google/zork/data.apcb
rename to src/mainboard/google/zork/uma_128.apcb
index ee12694..fd605b4 100644
--- a/src/mainboard/google/zork/data.apcb
+++ b/src/mainboard/google/zork/uma_128.apcb
Binary files differ
diff --git a/src/mainboard/google/zork/data.apcb b/src/mainboard/google/zork/uma_256.apcb
similarity index 93%
copy from src/mainboard/google/zork/data.apcb
copy to src/mainboard/google/zork/uma_256.apcb
index ee12694..f3bd14f 100644
--- a/src/mainboard/google/zork/data.apcb
+++ b/src/mainboard/google/zork/uma_256.apcb
Binary files differ
diff --git a/src/mainboard/google/zork/data.apcb b/src/mainboard/google/zork/uma_512.apcb
similarity index 93%
copy from src/mainboard/google/zork/data.apcb
copy to src/mainboard/google/zork/uma_512.apcb
index ee12694..0914c2a 100644
--- a/src/mainboard/google/zork/data.apcb
+++ b/src/mainboard/google/zork/uma_512.apcb
Binary files differ
diff --git a/src/mainboard/google/zork/data.apcb b/src/mainboard/google/zork/uma_64.apcb
similarity index 93%
copy from src/mainboard/google/zork/data.apcb
copy to src/mainboard/google/zork/uma_64.apcb
index ee12694..99abf34 100644
--- a/src/mainboard/google/zork/data.apcb
+++ b/src/mainboard/google/zork/uma_64.apcb
Binary files differ