From ccb8b34194f6ea516e9424b305da185a6601a698 Mon Sep 17 00:00:00 2001
From: Kapil Porwal <kapilporwal@google.com>
Date: Sat, 24 May 2025 22:15:31 +0530
Subject: [PATCH] Revert "mb/var/uldrenite: Use VBT with limited resolution for
 4GBx32 memory"

This reverts commit 3ecaf04dad1bc5cec11ef9367fc9fc9992dc5e52.

Reason for revert: Build failure

```
make[2]: *** No rule to make target 'src/mainboard/google/brya/variants/uldrenite/data.vbt', needed by '/cb-build/coreboot-gerrit.0/gcc-chromeos/GOOGLE_ULDRENITE/coreboot.pre'.  Stop.
```

Change-Id: Ibc1c887c38950d22c91b0ecc76167c2ab7e6ae33
Signed-off-by: Kapil Porwal <kapilporwal@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/87816
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Subrata Banik <subratabanik@google.com>
---
 src/mainboard/google/brya/Kconfig               |  1 -
 .../google/brya/variants/uldrenite/variant.c    | 17 -----------------
 2 files changed, 18 deletions(-)

diff --git a/src/mainboard/google/brya/Kconfig b/src/mainboard/google/brya/Kconfig
index 07bbec852e..59895cc839 100644
--- a/src/mainboard/google/brya/Kconfig
+++ b/src/mainboard/google/brya/Kconfig
@@ -697,7 +697,6 @@ config BOARD_GOOGLE_ULDRENITE
 	select ENFORCE_MEM_CHANNEL_DISABLE
 	select HAVE_PCIE_WWAN
 	select HAVE_WWAN_POWER_SEQUENCE
-	select INTEL_GMA_HAVE_VBT
 	select MAINBOARD_HAS_GOOGLE_STRAUSS_KEYBOARD
 	select SOC_INTEL_COMMON_BLOCK_HDA_VERB
 	select SOC_INTEL_TCSS_USE_PDC_PMC_USBC_MUX_CONFIGURATION
diff --git a/src/mainboard/google/brya/variants/uldrenite/variant.c b/src/mainboard/google/brya/variants/uldrenite/variant.c
index 8f1a016fde..a7927eb0d3 100644
--- a/src/mainboard/google/brya/variants/uldrenite/variant.c
+++ b/src/mainboard/google/brya/variants/uldrenite/variant.c
@@ -5,9 +5,7 @@
 #include <boardid.h>
 #include <console/console.h>
 #include <delay.h>
-#include <drivers/intel/gma/opregion.h>
 #include <fw_config.h>
-#include <gpio.h>
 #include <sar.h>
 #include <soc/bootblock.h>
 #include <stdlib.h>
@@ -174,21 +172,6 @@ void variant_update_descriptor(void)
 	}
 }
 
-const char *mainboard_vbt_filename(void)
-{
-	/*
-	 * GPP_E13 High -> One RAM Chip
-	 * GPP_E13 Low  -> Two RAM Chips
-	 */
-	if (gpio_get(GPP_E13)) {
-		printk(BIOS_INFO,
-			"x32 memory detected, so use vbt-uldrenite_x32mem.bin\n");
-		return "vbt-uldrenite_x32mem.bin";
-	}
-	printk(BIOS_INFO, "Non-x32 memory detected, so use vbt.bin\n");
-	return "vbt.bin";
-}
-
 void variant_configure_pads(void)
 {
 	const struct pad_config *base_pads;