summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEd Swierk <eswierk@arastra.com>2008-03-16 23:43:04 +0000
committerStefan Reinauer <stepan@openbios.org>2008-03-16 23:43:04 +0000
commit4f83d7ed962f93406f7884a1e4516e33b0d3fb19 (patch)
tree10542125193604c803ccd9acb9505b52a90baec2 /src
parent354e2d3dc1e1c670128114139350420d9c10b8cd (diff)
downloadcoreboot-4f83d7ed962f93406f7884a1e4516e33b0d3fb19.tar.xz
oops. sorry, wrong checkin. This patch backs out r3155 and instead contains the
code it should have contained. This patch updates the PCI IDs for Intel 3100 devices. Signed-off-by: Ed Swierk <eswierk@arastra.com> Acked-by: Uwe Hermann <uwe@hermann-uwe.de> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3160 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src')
-rw-r--r--src/arch/i386/include/arch/acpi.h6
-rw-r--r--src/include/device/pci_ids.h14
2 files changed, 10 insertions, 10 deletions
diff --git a/src/arch/i386/include/arch/acpi.h b/src/arch/i386/include/arch/acpi.h
index 5c0e73f181..a69d8ca00f 100644
--- a/src/arch/i386/include/arch/acpi.h
+++ b/src/arch/i386/include/arch/acpi.h
@@ -31,14 +31,14 @@ typedef unsigned long long u64;
#define SLIT_NAME "SLIT"
#define RSDT_TABLE "RSDT "
-#define HPET_TABLE "HPET "
+#define HPET_TABLE "AMD64 "
#define MCFG_TABLE "MCFG "
#define MADT_TABLE "MADT "
#define SRAT_TABLE "SRAT "
#define SLIT_TABLE "SLIT "
-#define OEM_ID "COREv2"
-#define ASLC "CORE"
+#define OEM_ID "LXBIOS"
+#define ASLC "NONE"
/* ACPI 2.0 table RSDP */
diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h
index 942bd64b54..ff1edc81a2 100644
--- a/src/include/device/pci_ids.h
+++ b/src/include/device/pci_ids.h
@@ -2335,15 +2335,17 @@
#define PCI_DEVICE_ID_INTEL_6300ESB_WDT 0x25ab
/* Intel 3100 */
-#define PCI_DEVICE_ID_INTEL_3100_ISA 0x2670
+#define PCI_DEVICE_ID_INTEL_3100_LPC 0x2670
#define PCI_DEVICE_ID_INTEL_3100_EHCI 0x268c
#define PCI_DEVICE_ID_INTEL_3100_PCI 0x244e
-#define PCI_DEVICE_ID_INTEL_3100_USB 0x2688
-#define PCI_DEVICE_ID_INTEL_3100_SMB 0x269b
-#define PCI_DEVICE_ID_INTEL_3100_USB2 0x2689
-#define PCI_DEVICE_ID_INTEL_3100_USB3 0x268c
#define PCI_DEVICE_ID_INTEL_3100_SATA 0x2680
#define PCI_DEVICE_ID_INTEL_3100_SATA_R 0x2681
+#define PCI_DEVICE_ID_INTEL_3100_USB 0x2688
+#define PCI_DEVICE_ID_INTEL_3100_USB2 0x2689
+#define PCI_DEVICE_ID_INTEL_3100_SMB 0x269b
+#define PCI_DEVICE_ID_INTEL_3100_MC 0x35b0
+#define PCI_DEVICE_ID_INTEL_3100_PCIE_PA 0x35b6
+#define PCI_DEVICE_ID_INTEL_3100_PCIE_PA1 0x35b7
#define PCI_DEVICE_ID_INTEL_80310 0x530d
#define PCI_DEVICE_ID_INTEL_82810_MC1 0x7120
@@ -2371,8 +2373,6 @@
#define PCI_DEVICE_ID_INTEL_PCIE_PA1 0x3596
#define PCI_DEVICE_ID_INTEL_PCIE_PB 0x3597
#define PCI_DEVICE_ID_INTEL_PCIE_PC 0x3599
-#define PCI_DEVICE_ID_INTEL_PCIE_QA 0x35b6
-#define PCI_DEVICE_ID_INTEL_PCIE_QA1 0x35b7
#define PCI_VENDOR_ID_COMPUTONE 0x8e0e
#define PCI_DEVICE_ID_COMPUTONE_IP2EX 0x0291