[coreboot-gerrit] Change in coreboot[master]: [WIP] Porting Gigabyte GA-H61M-DS2. VGA and PCIe card issues.

[Alexander Morgan (Code Review)]

Alexander Morgan has uploaded this change for review. ( https://review.coreboot.org/20919

Change subject: [WIP] Porting Gigabyte GA-H61M-DS2. VGA and PCIe card issues.
......................................................................

[WIP] Porting Gigabyte GA-H61M-DS2. VGA and PCIe card issues.

Change-Id: I69792873861ab657c83a17f7ec0624a8092e588a
---
M src/northbridge/intel/sandybridge/gma.c
M src/northbridge/intel/sandybridge/gma_sandybridge_lvds.c
2 files changed, 7 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/19/20919/1

diff --git a/src/northbridge/intel/sandybridge/gma.c b/src/northbridge/intel/sandybridge/gma.c
index db24dda..1189160 100644
--- a/src/northbridge/intel/sandybridge/gma.c
+++ b/src/northbridge/intel/sandybridge/gma.c
@@ -32,6 +32,9 @@
 #include "sandybridge.h"
 #include "gma.h"

+// Including this c directly to fix the definition error "i915lightup_sandy.
+#include "gma_sandybridge_lvds.c"
+
 struct gt_powermeter {
    u16 reg;
    u32 value;
@@ -648,7 +651,7 @@
    			    physbase, &lightup_ok);
    	} else {
    		lightup_ok = i915lightup_sandy(&conf->gfx, physbase,
-					iobase, mmiobase, graphics_base);
+					(u16) iobase, mmiobase, graphics_base);
    	}
    	if (lightup_ok)
    		gfx_set_init_done(1);
diff --git a/src/northbridge/intel/sandybridge/gma_sandybridge_lvds.c b/src/northbridge/intel/sandybridge/gma_sandybridge_lvds.c
index c3139a9..9a1a4ad 100644
--- a/src/northbridge/intel/sandybridge/gma_sandybridge_lvds.c
+++ b/src/northbridge/intel/sandybridge/gma_sandybridge_lvds.c
@@ -134,7 +134,9 @@
    	return 0;

if ((bridge_silicon_revision() & BASE_REV_MASK) == BASE_REV_IVB) {
-		return i915lightup_ivy(info, physbase, piobase, mmio, lfb);
+// Commenting this call out. My board is sandy and this non-definition
+// breaks build.
+//		return i915lightup_ivy(info, physbase, piobase, mmio, lfb);
    }

write32(mmio + 0x00070080, 0x00000000);