GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i945: Use defines for DEVEN 

Change-Id: I32461449354155510c0e14e9d0ce396068ea50d4
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/5890
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Idwer Vollering <vidwer@gmail.com>
This commit is contained in:
Kyösti Mälkki 2014-05-31 11:32:54 +03:00
parent 66f10b1a19
commit 3c3e34d69f
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/northbridge/intel/i945/early_init.c
View File

@ -248,7 +248,7 @@ static void i945_setup_egress_port(void)
} }
/* Is internal graphics enabled? */ /* 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); MCHBAR32(MMARB1) |= (1 << 17);
} }
@ -431,7 +431,7 @@ static void i945_setup_dmi_rcrb(void)
#endif #endif
DMIBAR32(0x204) = reg32; 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"); printk(BIOS_DEBUG, "Internal graphics: enabled\n");
DMIBAR32(0x200) |= (1 << 21); DMIBAR32(0x200) |= (1 << 21);
} else { } else {
@ -649,10 +649,9 @@ static void i945_setup_pci_express_x16(void)
reg16 = (1 << 1); reg16 = (1 << 1);
pci_write_config16(PCI_DEV(0, 0x0, 0), 0x52, reg16); pci_write_config16(PCI_DEV(0, 0x0, 0), 0x52, reg16);
/* DEVEN */ reg32 = pci_read_config32(PCI_DEV(0, 0x0, 0), DEVEN);
reg32 = pci_read_config32(PCI_DEV(0, 0x0, 0), 0x54); reg32 &= ~(DEVEN_D2F0 | DEVEN_D2F1);
reg32 &= ~((1 << 3) | (1 << 4)); pci_write_config32(PCI_DEV(0, 0x0, 0), DEVEN, reg32);
pci_write_config32(PCI_DEV(0, 0x0, 0), 0x54, reg32);
/* Set VGA enable bit in PCIe bridge */ /* Set VGA enable bit in PCIe bridge */
reg16 = pci_read_config16(PCI_DEV(0, 0x1, 0), 0x3e); reg16 = pci_read_config16(PCI_DEV(0, 0x1, 0), 0x3e);

2
src/northbridge/intel/i945/ram_calc.c
View File

@ -28,7 +28,7 @@ unsigned long get_top_of_ram(void)
{ {
u32 tom; 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 */ /* IGD enabled, get top of Memory from BSM register */
tom = pci_read_config32(PCI_DEV(0,2,0), BSM); tom = pci_read_config32(PCI_DEV(0,2,0), BSM);
} else { } else {