[coreboot-gerrit] Change in coreboot[master]: drivers/intel/gma: use soc/intel/common for loading VBT from cbfs

[Patrick Georgi (Code Review)]

Patrick Georgi has uploaded this change for review. ( https://review.coreboot.org/26039


Change subject: drivers/intel/gma: use soc/intel/common for loading VBT from cbfs
......................................................................

drivers/intel/gma: use soc/intel/common for loading VBT from cbfs

Change-Id: I8d149c8b480e457a4f3e947f46d49ab45c65ccdc
Signed-off-by: Patrick Georgi <pgeorgi at google.com>
---
M src/drivers/intel/gma/opregion.c
1 file changed, 11 insertions(+), 7 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/39/26039/1

diff --git a/src/drivers/intel/gma/opregion.c b/src/drivers/intel/gma/opregion.c
index b939b88..298a657 100644
--- a/src/drivers/intel/gma/opregion.c
+++ b/src/drivers/intel/gma/opregion.c
@@ -26,6 +26,7 @@
 #include <cbmem.h>
 #include "intel_bios.h"
 #include "opregion.h"
+#include <soc/intel/common/vbt.h>
 
 /* Write ASLS PCI register and prepare SWSCI register. */
 void intel_gma_opregion_register(uintptr_t opregion)
@@ -167,14 +168,17 @@
 
 static enum cb_err locate_vbt_cbfs(struct region_device *rdev)
 {
-	struct cbfsf file_desc;
+	size_t vbt_data_size;
+	void *vbt_data = locate_vbt(&vbt_data_size);
 
-	/* try to locate vbt.bin in CBFS */
-	if (cbfs_boot_locate(&file_desc, "vbt.bin", NULL) == CB_SUCCESS) {
-		cbfs_file_data(rdev, &file_desc);
-		printk(BIOS_INFO, "GMA: Found VBT in CBFS\n");
-		return CB_SUCCESS;
-	}
+	if (vbt_data == NULL)
+		return CB_ERR;
+
+	if (rdev_chain(rdev, &addrspace_32bit.rdev, (uintptr_t)vbt_data,
+	    vbt_data_size))
+		return CB_ERR;
+
+	printk(BIOS_INFO, "GMA: Found VBT in CBFS\n");
 
 	return CB_ERR;
 }

-- 
To view, visit https://review.coreboot.org/26039
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8d149c8b480e457a4f3e947f46d49ab45c65ccdc
Gerrit-Change-Number: 26039
Gerrit-PatchSet: 1
Gerrit-Owner: Patrick Georgi <pgeorgi at google.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20180503/101ef88b/attachment-0001.html>