New patch to review for coreboot: ec502f6 i945: Use defines for DEVEN

[Kyösti Mälkki]

Kyösti Mälkki ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5890

-gerrit

commit ec502f68268caa3ebbf1e8cefce9bd144cfb1a82
Author: Kyösti Mälkki 
Date:   Sat May 31 11:32:54 2014 +0300

i945: Use defines for DEVEN

Change-Id: I32461449354155510c0e14e9d0ce396068ea50d4
    Signed-off-by: Kyösti Mälkki 
---
 src/northbridge/intel/i945/early_init.c | 11 +++++------
 src/northbridge/intel/i945/ram_calc.c   |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/northbridge/intel/i945/early_init.c b/src/northbridge/intel/i945/early_init.c
index 57232af..a55ea05 100644
--- a/src/northbridge/intel/i945/early_init.c
+++ b/src/northbridge/intel/i945/early_init.c
@@ -248,7 +248,7 @@ static void i945_setup_egress_port(void)
    }

/* Is internal graphics enabled? */
-	if (pci_read_config8(PCI_DEV(0, 0x0, 0), 0x54) & ((1 << 4) | (1 << 3))) {	/* DEVEN */
+	if (pci_read_config8(PCI_DEV(0, 0x0, 0), DEVEN) & (DEVEN_D2F0 | DEVEN_D2F1)) {
    	MCHBAR32(MMARB1) |= (1 << 17);
    }

@@ -431,7 +431,7 @@ static void i945_setup_dmi_rcrb(void)
 #endif
    DMIBAR32(0x204) = reg32;

-	if (pci_read_config8(PCI_DEV(0, 0x0, 0), 0x54) & ((1 << 4) | (1 << 3))) {	/* DEVEN */
+	if (pci_read_config8(PCI_DEV(0, 0x0, 0), DEVEN) & (DEVEN_D2F0 | DEVEN_D2F1)) {
    	printk(BIOS_DEBUG, "Internal graphics: enabled\n");
    	DMIBAR32(0x200) |= (1 << 21);
    } else {
@@ -649,10 +649,9 @@ static void i945_setup_pci_express_x16(void)
    	reg16 = (1 << 1);
    	pci_write_config16(PCI_DEV(0, 0x0, 0), 0x52, reg16);

-		/* DEVEN */
-		reg32 = pci_read_config32(PCI_DEV(0, 0x0, 0), 0x54);
-		reg32 &= ~((1 << 3) | (1 << 4));
-		pci_write_config32(PCI_DEV(0, 0x0, 0), 0x54, reg32);
+		reg32 = pci_read_config32(PCI_DEV(0, 0x0, 0), DEVEN);
+		reg32 &= ~(DEVEN_D2F0 | DEVEN_D2F1);
+		pci_write_config32(PCI_DEV(0, 0x0, 0), DEVEN, reg32);

/* Set VGA enable bit in PCIe bridge */
    	reg16 = pci_read_config16(PCI_DEV(0, 0x1, 0), 0x3e);
diff --git a/src/northbridge/intel/i945/ram_calc.c b/src/northbridge/intel/i945/ram_calc.c
index 51eb0ff..23e3f41 100644
--- a/src/northbridge/intel/i945/ram_calc.c
+++ b/src/northbridge/intel/i945/ram_calc.c
@@ -28,7 +28,7 @@ unsigned long get_top_of_ram(void)
 {
    u32 tom;

-	if (pci_read_config8(PCI_DEV(0, 0x0, 0), DEVEN) & ((1 << 4) | (1 << 3))) {
+	if (pci_read_config8(PCI_DEV(0, 0x0, 0), DEVEN) & (DEVEN_D2F0 | DEVEN_D2F1)) {
    	/* IGD enabled, get top of Memory from BSM register */
    	tom = pci_read_config32(PCI_DEV(0,2,0), BSM);
    } else {