summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mainboard/google/zork/Kconfig21
-rw-r--r--src/mainboard/google/zork/spd/Makefile.mk11
-rw-r--r--src/mainboard/google/zork/uma_128.apcb (renamed from src/mainboard/google/zork/data.apcb)bin4672 -> 4672 bytes
-rw-r--r--src/mainboard/google/zork/uma_256.apcbbin0 -> 4672 bytes
-rw-r--r--src/mainboard/google/zork/uma_512.apcbbin0 -> 4672 bytes
-rw-r--r--src/mainboard/google/zork/uma_64.apcbbin0 -> 4672 bytes
6 files changed, 31 insertions, 1 deletions
diff --git a/src/mainboard/google/zork/Kconfig b/src/mainboard/google/zork/Kconfig
index 1fcd06ba8e..1b38d270ee 100644
--- a/src/mainboard/google/zork/Kconfig
+++ b/src/mainboard/google/zork/Kconfig
@@ -301,4 +301,25 @@ config CHROMEOS_WIFI_SAR
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 3e6509d9ae..1f0b20ce0d 100644
--- a/src/mainboard/google/zork/spd/Makefile.mk
+++ b/src/mainboard/google/zork/spd/Makefile.mk
@@ -5,7 +5,16 @@ 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_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
index ee12694946..fd605b4187 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/uma_256.apcb b/src/mainboard/google/zork/uma_256.apcb
new file mode 100644
index 0000000000..f3bd14fd16
--- /dev/null
+++ b/src/mainboard/google/zork/uma_256.apcb
Binary files differ
diff --git a/src/mainboard/google/zork/uma_512.apcb b/src/mainboard/google/zork/uma_512.apcb
new file mode 100644
index 0000000000..0914c2a6a3
--- /dev/null
+++ b/src/mainboard/google/zork/uma_512.apcb
Binary files differ
diff --git a/src/mainboard/google/zork/uma_64.apcb b/src/mainboard/google/zork/uma_64.apcb
new file mode 100644
index 0000000000..99abf34f14
--- /dev/null
+++ b/src/mainboard/google/zork/uma_64.apcb
Binary files differ