[coreboot-gerrit] [S] Change in coreboot[main]: mb/google/kahlee: Add Kconfig to set IGD UMA allocation

[Felix Held (Code Review)]

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

Change subject: mb/google/kahlee: Add Kconfig to set IGD UMA allocation
......................................................................

mb/google/kahlee: Add Kconfig to set IGD UMA allocation

Add a Kconfig choice to select the IGD UMA allocation. Default to the
previous value (32MB).

TEST=build/boot google/liara, verify UMA size changes with selection.

Change-Id: Ia53d6d39d4f06c896ec13808234144b89da101f8
Signed-off-by: Matt DeVillier 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/84235
Reviewed-by: Felix Held 
Tested-by: build bot (Jenkins) 
---
M src/mainboard/google/kahlee/Kconfig
M src/mainboard/google/kahlee/variants/baseboard/devicetree.cb
2 files changed, 28 insertions(+), 1 deletion(-)

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

diff --git a/src/mainboard/google/kahlee/Kconfig b/src/mainboard/google/kahlee/Kconfig
index 86632db..60630fe 100644
--- a/src/mainboard/google/kahlee/Kconfig
+++ b/src/mainboard/google/kahlee/Kconfig
@@ -172,4 +172,31 @@
    default n if CHROMEOS
    default y

+choice
+	prompt "UMA Memory Allocation"
+	default KAHLEE_UMA_SIZE_32MB
+	help
+	  The amount of system memory allocated for the integrated GPU
+
+config KAHLEE_UMA_SIZE_32MB
+	bool "32MB"
+
+config KAHLEE_UMA_SIZE_64MB
+	bool "64MB"
+
+config KAHLEE_UMA_SIZE_128MB
+	bool "128MB"
+
+config KAHLEE_UMA_SIZE_256MB
+	bool "256MB"
+
+endchoice
+
+config UMA_SIZE_IN_MB
+	int
+	default 32  if KAHLEE_UMA_SIZE_32MB
+	default 64  if KAHLEE_UMA_SIZE_64MB
+	default 128 if KAHLEE_UMA_SIZE_128MB
+	default 256 if KAHLEE_UMA_SIZE_256MB
+
 endif # BOARD_GOOGLE_BASEBOARD_KAHLEE
diff --git a/src/mainboard/google/kahlee/variants/baseboard/devicetree.cb b/src/mainboard/google/kahlee/variants/baseboard/devicetree.cb
index ef7839d..ca8933a 100644
--- a/src/mainboard/google/kahlee/variants/baseboard/devicetree.cb
+++ b/src/mainboard/google/kahlee/variants/baseboard/devicetree.cb
@@ -8,7 +8,7 @@
    }"
    register "dram_clear_on_reset" = "DRAM_CONTENTS_KEEP"
    register "uma_mode" = "UMAMODE_SPECIFIED_SIZE"
-	register "uma_size" = "32 * MiB"
+	register "uma_size" = "CONFIG_UMA_SIZE_IN_MB * MiB"

register "i2c_scl_reset" = "GPIO_I2C0_SCL | GPIO_I2C1_SCL |
    			    GPIO_I2C2_SCL | GPIO_I2C3_SCL"