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

nb/intel/haswell: Consolidate memory controller PCI driver structs 

Since the `PCI_DEVICE_ID_HSW_*` constants are no longer used, remove
them.

Change-Id: I84f1f069faa6a4165cf289f2e6c40889a49cad1d
Signed-off-by: Tristan Corrick <tristan@corrick.kiwi>
Reviewed-on: https://review.coreboot.org/29396
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
This commit is contained in:
Tristan Corrick 2018-11-01 03:03:29 +13:00 committed by Nico Huber
parent d48a3a3b7f
commit d385624ee6
2 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/northbridge/intel/haswell/haswell.h
View File

@ -210,10 +210,6 @@ struct ied_header {
u8 reserved[34];
} __packed;
#define PCI_DEVICE_ID_HSW_DESKTOP 0x0c00
#define PCI_DEVICE_ID_HSW_MOBILE 0x0c04
#define PCI_DEVICE_ID_HSW_ULT 0x0a04
#ifdef __SMM__
void intel_northbridge_haswell_finalize_smm(void);
#else /* !__SMM__ */

19
src/northbridge/intel/haswell/northbridge.c
View File

@ -478,22 +478,17 @@ static struct device_operations mc_ops = {
.ops_pci = &intel_pci_ops,
};
static const struct pci_driver mc_driver_hsw_normal __pci_driver = {
.ops = &mc_ops,
.vendor = PCI_VENDOR_ID_INTEL,
.device = PCI_DEVICE_ID_HSW_DESKTOP,
static const unsigned short mc_pci_device_ids[] = {
0x0c00, /* Desktop */
0x0c04, /* Mobile */
0x0a04, /* ULT */
0
};
static const struct pci_driver mc_driver_hsw_mobile __pci_driver = {
static const struct pci_driver mc_driver_hsw __pci_driver = {
.ops = &mc_ops,
.vendor = PCI_VENDOR_ID_INTEL,
.device = PCI_DEVICE_ID_HSW_MOBILE,
};
static const struct pci_driver mc_driver_hsw_ult __pci_driver = {
.ops = &mc_ops,
.vendor = PCI_VENDOR_ID_INTEL,
.device = PCI_DEVICE_ID_HSW_ULT,
.devices = mc_pci_device_ids,
};
static void cpu_bus_init(struct device *dev)