r3715 - in trunk/coreboot-v2/src: include/device northbridge/intel/i945 southbridge/intel/i82801gx
Author: uwe Date: 2008-10-31 19:41:09 +0100 (Fri, 31 Oct 2008) New Revision: 3715
Modified: trunk/coreboot-v2/src/include/device/pci_ids.h trunk/coreboot-v2/src/northbridge/intel/i945/northbridge.c trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_ac97.c trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_ide.c trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_lpc.c trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_nic.c trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_pci.c trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_pcie.c trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_sata.c trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_smbus.c trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_usb.c trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_usb_ehci.c Log: Revert i945/ICH7 PCI IDs to be hard-coded numbers instead of #defines.
Build-tested on kontron_986lcd_m.
Signed-off-by: Uwe Hermann uwe@hermann-uwe.de Acked-by: Carl-Daniel Hailfinger c-d.hailfinger.devel.2006@gmx.net
Modified: trunk/coreboot-v2/src/include/device/pci_ids.h =================================================================== --- trunk/coreboot-v2/src/include/device/pci_ids.h 2008-10-31 05:40:04 UTC (rev 3714) +++ trunk/coreboot-v2/src/include/device/pci_ids.h 2008-10-31 18:41:09 UTC (rev 3715) @@ -2395,9 +2395,6 @@ #define PCI_DEVICE_ID_INTEL_EP80579_PCIE_PA0 0x5024 #define PCI_DEVICE_ID_INTEL_EP80579_PCIE_PA1 0x5025
-/* Intel 945 */ -#define PCI_DEVICE_ID_INTEL_945_HOST_BRIDGE 0x27a0 - #define PCI_DEVICE_ID_INTEL_80310 0x530d #define PCI_DEVICE_ID_INTEL_82810_MC1 0x7120 #define PCI_DEVICE_ID_INTEL_82810_IG1 0x7121
Modified: trunk/coreboot-v2/src/northbridge/intel/i945/northbridge.c =================================================================== --- trunk/coreboot-v2/src/northbridge/intel/i945/northbridge.c 2008-10-31 05:40:04 UTC (rev 3714) +++ trunk/coreboot-v2/src/northbridge/intel/i945/northbridge.c 2008-10-31 18:41:09 UTC (rev 3715) @@ -247,7 +247,7 @@ static const struct pci_driver mc_driver __pci_driver = { .ops = &mc_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_945_HOST_BRIDGE, + .device = 0x27a0, };
static void cpu_bus_init(device_t dev)
Modified: trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_ac97.c =================================================================== --- trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_ac97.c 2008-10-31 05:40:04 UTC (rev 3714) +++ trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_ac97.c 2008-10-31 18:41:09 UTC (rev 3715) @@ -57,7 +57,7 @@ static const struct pci_driver i82801gx_ac97_audio __pci_driver = { .ops = &ac97_audio_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801GB_AC97_AUDIO, + .device = 0x27de, };
/* 82801GB/GR/GDH/GBM/GHM (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH) */ @@ -65,5 +65,5 @@ static const struct pci_driver i82801gx_ac97_modem __pci_driver = { .ops = &ac97_modem_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801GB_AC97_MODEM, + .device = 0x27dd, };
Modified: trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_ide.c =================================================================== --- trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_ide.c 2008-10-31 05:40:04 UTC (rev 3714) +++ trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_ide.c 2008-10-31 18:41:09 UTC (rev 3715) @@ -96,5 +96,5 @@ static const struct pci_driver i82801gx_ide __pci_driver = { .ops = &ide_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801GB_IDE, + .device = 0x27df, };
Modified: trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_lpc.c =================================================================== --- trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_lpc.c 2008-10-31 05:40:04 UTC (rev 3714) +++ trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_lpc.c 2008-10-31 18:41:09 UTC (rev 3715) @@ -342,19 +342,19 @@ static const struct pci_driver ich7_ich7r_ich7dh_lpc __pci_driver = { .ops = &device_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801GB_LPC, + .device = 0x27b8, };
/* 82801GBM/GU (ICH7-M/ICH7-U) */ static const struct pci_driver ich7m_ich7u_lpc __pci_driver = { .ops = &device_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801GBM_LPC, + .device = 0x27b9, };
/* 82801GHM (ICH7-M DH) */ static const struct pci_driver ich7m_dh_lpc __pci_driver = { .ops = &device_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801GHM_LPC, + .device = 0x27bd, };
Modified: trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_nic.c =================================================================== --- trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_nic.c 2008-10-31 05:40:04 UTC (rev 3714) +++ trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_nic.c 2008-10-31 18:41:09 UTC (rev 3715) @@ -44,5 +44,5 @@ static const struct pci_driver i82801gx_nic __pci_driver = { .ops = &nic_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801GB_LAN, + .device = 0x27dc, };
Modified: trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_pci.c =================================================================== --- trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_pci.c 2008-10-31 05:40:04 UTC (rev 3714) +++ trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_pci.c 2008-10-31 18:41:09 UTC (rev 3715) @@ -129,7 +129,7 @@ static const struct pci_driver i82801g_pci __pci_driver = { .ops = &device_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801GB_PCI, + .device = 0x244e, };
/* Mobile / Ultra Mobile */ @@ -137,5 +137,5 @@ static const struct pci_driver i82801gmu_pci __pci_driver = { .ops = &device_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801FBM_PCI, + .device = 0x2448, };
Modified: trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_pcie.c =================================================================== --- trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_pcie.c 2008-10-31 05:40:04 UTC (rev 3714) +++ trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_pcie.c 2008-10-31 18:41:09 UTC (rev 3715) @@ -88,40 +88,40 @@ static const struct pci_driver i82801gx_pcie_port1 __pci_driver = { .ops = &device_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801GB_PCIE1, + .device = 0x27d0, };
/* 82801GB/GR/GDH/GBM/GHM (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH) */ static const struct pci_driver i82801gx_pcie_port2 __pci_driver = { .ops = &device_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801GB_PCIE2, + .device = 0x27d2, };
/* 82801GB/GR/GDH/GBM/GHM (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH) */ static const struct pci_driver i82801gx_pcie_port3 __pci_driver = { .ops = &device_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801GB_PCIE3, + .device = 0x27d4, };
/* 82801GB/GR/GDH/GBM/GHM (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH) */ static const struct pci_driver i82801gx_pcie_port4 __pci_driver = { .ops = &device_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801GB_PCIE4, + .device = 0x27d6, };
/* 82801GR/GDH/GHM (ICH7R/ICH7DH/ICH7-M DH) */ static const struct pci_driver i82801gx_pcie_port5 __pci_driver = { .ops = &device_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801GR_PCIE5, + .device = 0x27e0, };
/* 82801GR/GDH/GHM (ICH7R/ICH7DH/ICH7-M DH) */ static const struct pci_driver i82801gx_pcie_port6 __pci_driver = { .ops = &device_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801GR_PCIE6, + .device = 0x27e2, };
Modified: trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_sata.c =================================================================== --- trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_sata.c 2008-10-31 05:40:04 UTC (rev 3714) +++ trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_sata.c 2008-10-31 18:41:09 UTC (rev 3715) @@ -149,7 +149,7 @@ static const struct pci_driver i82801gx_sata_normal_driver __pci_driver = { .ops = &sata_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801GB_SATA, + .device = 0x27c0, };
/* NOTE: Any of the below are not properly supported yet. */ @@ -159,7 +159,7 @@ static const struct pci_driver i82801gx_sata_ahci_driver __pci_driver = { .ops = &sata_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801GB_SATA_AHCI, + .device = 0x27c1, };
/* Desktop RAID mode */ @@ -167,7 +167,7 @@ static const struct pci_driver i82801gx_sata_raid_driver __pci_driver = { .ops = &sata_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801GB_SATA_RAID, + .device = 0x27c3, };
/* Mobile Non-AHCI and Non-RAID Mode */ @@ -175,7 +175,7 @@ static const struct pci_driver i82801gx_sata_mobile_normal_driver __pci_driver = { .ops = &sata_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801GBM_SATA, + .device = 0x27c4, };
/* Mobile AHCI Mode */ @@ -183,7 +183,7 @@ static const struct pci_driver i82801gx_sata_mobile_ahci_driver __pci_driver = { .ops = &sata_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801GBM_SATA_AHCI, + .device = 0x27c5, };
/* ICH7M DH Raid Mode */ @@ -191,5 +191,5 @@ static const struct pci_driver i82801gx_sata_ich7dh_raid_driver __pci_driver = { .ops = &sata_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801GHM_SATA_RAID, + .device = 0x27c6, };
Modified: trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_smbus.c =================================================================== --- trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_smbus.c 2008-10-31 05:40:04 UTC (rev 3714) +++ trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_smbus.c 2008-10-31 18:41:09 UTC (rev 3715) @@ -55,5 +55,5 @@ static const struct pci_driver i82801gx_smbus __pci_driver = { .ops = &smbus_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801GB_SMB, + .device = 0x27da, };
Modified: trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_usb.c =================================================================== --- trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_usb.c 2008-10-31 05:40:04 UTC (rev 3714) +++ trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_usb.c 2008-10-31 18:41:09 UTC (rev 3715) @@ -55,26 +55,26 @@ static const struct pci_driver i82801gb_usb1 __pci_driver = { .ops = &usb_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801GB_USB1, + .device = 0x27c8, };
/* 82801GB/GR/GDH/GBM/GHM/GU (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH/ICH7-U) */ static const struct pci_driver i82801gb_usb2 __pci_driver = { .ops = &usb_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801GB_USB2, + .device = 0x27c9, };
/* 82801GB/GR/GDH/GBM/GHM/GU (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH/ICH7-U) */ static const struct pci_driver i82801gb_usb3 __pci_driver = { .ops = &usb_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801GB_USB3, + .device = 0x27ca, };
/* 82801GB/GR/GDH/GBM/GHM/GU (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH/ICH7-U) */ static const struct pci_driver i82801gb_usb4 __pci_driver = { .ops = &usb_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801GB_USB4, + .device = 0x27cb, };
Modified: trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_usb_ehci.c =================================================================== --- trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_usb_ehci.c 2008-10-31 05:40:04 UTC (rev 3714) +++ trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_usb_ehci.c 2008-10-31 18:41:09 UTC (rev 3715) @@ -80,5 +80,5 @@ static const struct pci_driver i82801gx_usb_ehci __pci_driver = { .ops = &usb_ehci_ops, .vendor = PCI_VENDOR_ID_INTEL, - .device = PCI_DEVICE_ID_INTEL_82801GB_EHCI, + .device = 0x27cc, };
-
svn＠coreboot.org