[coreboot] New patch to review for coreboot: 760338b Revert "Fix mainboard level enable_dev()"

Stefan Reinauer (stefan.reinauer@coreboot.org) gerrit at coreboot.org
Tue Aug 7 22:11:43 CEST 2012


Stefan Reinauer (stefan.reinauer at coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1419

-gerrit

commit 760338b6a17e992c8cdf918c6a1dbdd322bee3f0
Author: Stefan Reinauer <stefan.reinauer at coreboot.org>
Date:   Tue Aug 7 22:11:42 2012 +0200

    Revert "Fix mainboard level enable_dev()"
    
    This reverts commit 15cf0adc3edaf184d98a3b3c228e0858ff7b24d3
    
    There is more stuff broken. Hence backing out the complete chip.h removal.
---
 src/devices/device.c                    |    4 ++--
 src/include/device/device.h             |    1 -
 src/mainboard/emulation/qemu-x86/chip.h |    4 ++++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/devices/device.c b/src/devices/device.c
index 344f824..6b1902d 100644
--- a/src/devices/device.c
+++ b/src/devices/device.c
@@ -923,8 +923,8 @@ void dev_enumerate(void)
 	printk(BIOS_SPEW, "Compare with tree...\n");
 	show_devs_tree(root, BIOS_SPEW, 0, 0);
 
-	if (mainboard_ops.enable_dev)
-		mainboard_ops.enable_dev(root);
+	if (root->chip_ops && root->chip_ops->enable_dev)
+		root->chip_ops->enable_dev(root);
 
 	if (!root->ops || !root->ops->scan_bus) {
 		printk(BIOS_ERR, "dev_root missing scan_bus operation");
diff --git a/src/include/device/device.h b/src/include/device/device.h
index 0b15ac5..9e9d000 100644
--- a/src/include/device/device.h
+++ b/src/include/device/device.h
@@ -165,7 +165,6 @@ void show_all_devs_resources(int debug_level, const char* msg);
 #define DEVICE_MEM_ALIGN 4096
 
 extern struct device_operations default_dev_ops_root;
-extern struct chip_operations mainboard_ops;
 void pci_domain_read_resources(struct device *dev);
 unsigned int pci_domain_scan_bus(struct device *dev, unsigned int max);
 unsigned int scan_static_bus(device_t bus, unsigned int max);
diff --git a/src/mainboard/emulation/qemu-x86/chip.h b/src/mainboard/emulation/qemu-x86/chip.h
index ff9301f..56a14ed 100644
--- a/src/mainboard/emulation/qemu-x86/chip.h
+++ b/src/mainboard/emulation/qemu-x86/chip.h
@@ -1,3 +1,7 @@
+extern struct chip_operations mainboard_ops;
+
+struct mainboard_config {};
+
 struct mainboard_emulation_qemu_x86_config {};
 
 extern struct chip_operations mainboard_emulation_qemu_x86_ops;




More information about the coreboot mailing list