diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2012-07-27 19:22:26 +0300 |
|---|---|---|
| committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2012-08-03 00:34:49 +0200 |
| commit | 15cf0adc3edaf184d98a3b3c228e0858ff7b24d3 (patch) | |
| tree | 559ab5271c214f89992fbb14c3ec3d38523803c9 | |
| parent | a1e6a9c25a1d897fbb06f634bbee6e7983a95524 (diff) | |
Fix mainboard level enable_dev()
Commit 188e3c2ff06a82f61d7d71e610b32b1a250c0a45 dropped mainboard
out of the static device tree. This left dev_root->chip_ops unset,
and mainboard_ops.enable_dev() was no longer called.
Change-Id: I6d447c8049a66041b8bb36ec9aac3e7e0d20a99b
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/1374
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
| -rw-r--r-- | src/devices/device.c | 4 | ||||
| -rw-r--r-- | src/include/device/device.h | 1 | ||||
| -rw-r--r-- | src/mainboard/emulation/qemu-x86/chip.h | 4 |
3 files changed, 3 insertions, 6 deletions
diff --git a/src/devices/device.c b/src/devices/device.c index 6b1902d572..344f8240de 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 (root->chip_ops && root->chip_ops->enable_dev) - root->chip_ops->enable_dev(root); + if (mainboard_ops.enable_dev) + mainboard_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 9e9d00025c..0b15ac5aed 100644 --- a/src/include/device/device.h +++ b/src/include/device/device.h @@ -165,6 +165,7 @@ 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 56a14edd40..ff9301f418 100644 --- a/src/mainboard/emulation/qemu-x86/chip.h +++ b/src/mainboard/emulation/qemu-x86/chip.h @@ -1,7 +1,3 @@ -extern struct chip_operations mainboard_ops; - -struct mainboard_config {}; - struct mainboard_emulation_qemu_x86_config {}; extern struct chip_operations mainboard_emulation_qemu_x86_ops; |