commit a675d494082e689a0766ee98948779da13ea2d07
author Stefan Reinauer <reinauer@chromium.org> Tue Aug 07 14:50:47 2012 -0700
committer Anton Kochkov <anton.kochkov@gmail.com> Wed Aug 08 11:34:57 2012 +0200
tree 95d799aff0c4444998adc93ecae9d76249bc7e98
parent 6a73bf668849d5c8940f04197cf6087dcc45ce77

Fix SMBIOS generation

Dropping mainboard's chip.h broke execution of the mainboard's enable
function and the addition of mainboard specific smbios tables.

The former was fixed by Kyosti in http://review.coreboot.org/1374
This patch fixes the breakage in static.c and also backs out a small
portion of Kyosti's patch (because it's not needed anymore)

Change-Id: I6fdea9cbb8c6041663bd36f68f1cae4b435c1f9b
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: http://review.coreboot.org/1421
Tested-by: build bot (Jenkins)
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-by: Anton Kochkov <anton.kochkov@gmail.com>

src/devices/device.c

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 @@
 	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");

src/include/device/device.h

diff --git a/src/include/device/device.h b/src/include/device/device.h
index b44a551..772b737 100644
--- a/src/include/device/device.h
+++ b/src/include/device/device.h
@@ -102,7 +102,9 @@
 	ROMSTAGE_CONST struct bus *link_list;
 
 	struct device_operations *ops;
+#ifndef __PRE_RAM__
 	const struct chip_operations *chip_ops;
+#endif
 	ROMSTAGE_CONST void *chip_info;
 };
 
@@ -171,7 +173,6 @@
 #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);

util/sconfig/main.c

diff --git a/util/sconfig/main.c b/util/sconfig/main.c
index 82a7491..eb996a7 100644
--- a/util/sconfig/main.c
+++ b/util/sconfig/main.c
@@ -423,6 +423,10 @@
 			fprintf(fil, "\t.chip_ops = &%s_ops,\n", ptr->chip->name_underscore);
 			fprintf(fil, "#endif\n");
 			fprintf(fil, "\t.chip_info = &%s_info_%d,\n", ptr->chip->name_underscore, ptr->chip->id);
+		} else if (ptr->chip->chip == &mainboard) {
+			fprintf(fil, "#ifndef __PRE_RAM__\n");
+			fprintf(fil, "\t.chip_ops = &%s_ops,\n", ptr->chip->name_underscore);
+			fprintf(fil, "#endif\n");
 		}
 		if (ptr->nextdev)
 			fprintf(fil, "\t.next=&%s\n", ptr->nextdev->name);
@@ -628,6 +632,8 @@
 			    "ROMSTAGE_CONST struct device * ROMSTAGE_CONST last_dev = &%s;\n", lastdev->name);
 #ifdef MAINBOARDS_HAVE_CHIP_H
 		fprintf(autogen, "static ROMSTAGE_CONST struct mainboard_config ROMSTAGE_CONST mainboard_info_0;\n");
+#else
+		fprintf(autogen, "extern struct chip_operations mainboard_ops;\n");
 #endif
 		walk_device_tree(autogen, &root, pass1, NULL);