[coreboot-gerrit] Change in coreboot[master]: soc/intel, drivers/intel/gma: Move locate_vbt

[Patrick Rudolph (Code Review)]

Patrick Rudolph has uploaded a new change for review. ( https://review.coreboot.org/19311 )

Change subject: soc/intel,drivers/intel/gma: Move locate_vbt
......................................................................

soc/intel,drivers/intel/gma: Move locate_vbt

Move locate_vbt to Intel GMA driver folder.

Change-Id: Id0743aabe4feddd1a086f228c7b308d263d0b15a
Signed-off-by: Patrick Rudolph <siro at das-labor.org>
---
M src/drivers/intel/gma/i915.h
M src/drivers/intel/gma/vbt.c
M src/soc/intel/common/vbt.c
M src/soc/intel/common/vbt.h
4 files changed, 27 insertions(+), 25 deletions(-)


  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/11/19311/1

diff --git a/src/drivers/intel/gma/i915.h b/src/drivers/intel/gma/i915.h
index d9bb940..728bf7e 100644
--- a/src/drivers/intel/gma/i915.h
+++ b/src/drivers/intel/gma/i915.h
@@ -18,6 +18,7 @@
 
 #include <drivers/intel/gma/i915_reg.h>
 #include <drivers/intel/gma/drm_dp_helper.h>
+#include <commonlib/region.h>
 #include <edid.h>
 
 /* port types. We stick with the same defines as the kernel */
@@ -309,6 +310,9 @@
 generate_fake_intel_oprom(const struct i915_gpu_controller_info *conf,
 			  struct device *dev, const char *idstr);
 
+/* locate .vbt file */
+enum cb_err locate_vbt(struct region_device *rdev);
+
 /* interface to libgfxinit (gma.adb) */
 void gma_gfxinit(u64 mmio_base, u64 linear_fb, u32 phys_fb, int *success);
 
diff --git a/src/drivers/intel/gma/vbt.c b/src/drivers/intel/gma/vbt.c
index c908eb4..f7ccefd 100644
--- a/src/drivers/intel/gma/vbt.c
+++ b/src/drivers/intel/gma/vbt.c
@@ -105,3 +105,25 @@
 	oh->size = fake_oprom_size;
 	pcir->imagelength = fake_oprom_size;
 }
+
+/* locate .vbt file */
+enum cb_err locate_vbt(struct region_device *rdev)
+{
+	uint32_t vbtsig = 0;
+	struct cbfsf file_desc;
+
+	if (cbfs_boot_locate(&file_desc, "vbt.bin", NULL) < 0) {
+		printk(BIOS_ERR, "Could not locate a VBT file in in CBFS\n");
+		return CB_ERR;
+	}
+
+	cbfs_file_data(rdev, &file_desc);
+	rdev_readat(rdev, &vbtsig, 0, sizeof(uint32_t));
+
+	if (vbtsig != VBT_SIGNATURE) {
+		printk(BIOS_ERR, "Missing/invalid signature in VBT data file!\n");
+		return CB_ERR;
+	}
+
+	return CB_SUCCESS;
+}
diff --git a/src/soc/intel/common/vbt.c b/src/soc/intel/common/vbt.c
index d9bb98a..0d7155c 100644
--- a/src/soc/intel/common/vbt.c
+++ b/src/soc/intel/common/vbt.c
@@ -17,31 +17,9 @@
 #include <console/console.h>
 #include <arch/acpi.h>
 #include <bootmode.h>
+#include <drivers/intel/gma/i915.h>
 
 #include "vbt.h"
-
-#define VBT_SIGNATURE 0x54425624
-
-enum cb_err locate_vbt(struct region_device *rdev)
-{
-	uint32_t vbtsig = 0;
-	struct cbfsf file_desc;
-
-	if (cbfs_boot_locate(&file_desc, "vbt.bin", NULL) < 0) {
-		printk(BIOS_ERR, "Could not locate a VBT file in in CBFS\n");
-		return CB_ERR;
-	}
-
-	cbfs_file_data(rdev, &file_desc);
-	rdev_readat(rdev, &vbtsig, 0, sizeof(uint32_t));
-
-	if (vbtsig != VBT_SIGNATURE) {
-		printk(BIOS_ERR, "Missing/invalid signature in VBT data file!\n");
-		return CB_ERR;
-	}
-
-	return CB_SUCCESS;
-}
 
 void *vbt_get(struct region_device *rdev)
 {
diff --git a/src/soc/intel/common/vbt.h b/src/soc/intel/common/vbt.h
index 9a02e6a..7c99659 100644
--- a/src/soc/intel/common/vbt.h
+++ b/src/soc/intel/common/vbt.h
@@ -19,8 +19,6 @@
 #include <commonlib/region.h>
 #include <types.h>
 
-/* locate .vbt file */
-enum cb_err locate_vbt(struct region_device *rdev);
 /*
  * Returns VBT pointer and mapping after checking prerequisites for Pre OS
  * Graphics initialization

-- 
To view, visit https://review.coreboot.org/19311
To unsubscribe, visit https://review.coreboot.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id0743aabe4feddd1a086f228c7b308d263d0b15a
Gerrit-PatchSet: 1
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Owner: Patrick Rudolph <siro at das-labor.org>