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

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>
This commit is contained in:
Stefan Reinauer 2012-08-07 14:50:47 -07:00 committed by Anton Kochkov
parent 6a73bf6688
commit a675d49408
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/devices/device.c
View File

@ -923,8 +923,8 @@ void dev_enumerate(void)
printk(BIOS_SPEW, "Compare with tree...\n"); printk(BIOS_SPEW, "Compare with tree...\n");
show_devs_tree(root, BIOS_SPEW, 0, 0); show_devs_tree(root, BIOS_SPEW, 0, 0);
if (mainboard_ops.enable_dev) if (root->chip_ops && root->chip_ops->enable_dev)
mainboard_ops.enable_dev(root); root->chip_ops->enable_dev(root);
if (!root->ops || !root->ops->scan_bus) { if (!root->ops || !root->ops->scan_bus) {
printk(BIOS_ERR, "dev_root missing scan_bus operation"); printk(BIOS_ERR, "dev_root missing scan_bus operation");

3
src/include/device/device.h
View File

@ -102,7 +102,9 @@ struct device {
ROMSTAGE_CONST struct bus *link_list; ROMSTAGE_CONST struct bus *link_list;
struct device_operations *ops; struct device_operations *ops;
#ifndef __PRE_RAM__
const struct chip_operations *chip_ops; const struct chip_operations *chip_ops;
#endif
ROMSTAGE_CONST void *chip_info; ROMSTAGE_CONST void *chip_info;
}; };
@ -171,7 +173,6 @@ void show_all_devs_resources(int debug_level, const char* msg);
#define DEVICE_MEM_ALIGN 4096 #define DEVICE_MEM_ALIGN 4096
extern struct device_operations default_dev_ops_root; extern struct device_operations default_dev_ops_root;
extern struct chip_operations mainboard_ops;
void pci_domain_read_resources(struct device *dev); void pci_domain_read_resources(struct device *dev);
unsigned int pci_domain_scan_bus(struct device *dev, unsigned int max); unsigned int pci_domain_scan_bus(struct device *dev, unsigned int max);
unsigned int scan_static_bus(device_t bus, unsigned int max); unsigned int scan_static_bus(device_t bus, unsigned int max);

6
util/sconfig/main.c
View File

@ -423,6 +423,10 @@ static void pass1(FILE *fil, struct device *ptr)
fprintf(fil, "\t.chip_ops = &%s_ops,\n", ptr->chip->name_underscore); fprintf(fil, "\t.chip_ops = &%s_ops,\n", ptr->chip->name_underscore);
fprintf(fil, "#endif\n"); fprintf(fil, "#endif\n");
fprintf(fil, "\t.chip_info = &%s_info_%d,\n", ptr->chip->name_underscore, ptr->chip->id); 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) if (ptr->nextdev)
fprintf(fil, "\t.next=&%s\n", ptr->nextdev->name); fprintf(fil, "\t.next=&%s\n", ptr->nextdev->name);
@ -628,6 +632,8 @@ int main(int argc, char** argv) {
"ROMSTAGE_CONST struct device * ROMSTAGE_CONST last_dev = &%s;\n", lastdev->name); "ROMSTAGE_CONST struct device * ROMSTAGE_CONST last_dev = &%s;\n", lastdev->name);
#ifdef MAINBOARDS_HAVE_CHIP_H #ifdef MAINBOARDS_HAVE_CHIP_H
fprintf(autogen, "static ROMSTAGE_CONST struct mainboard_config ROMSTAGE_CONST mainboard_info_0;\n"); 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 #endif
walk_device_tree(autogen, &root, pass1, NULL); walk_device_tree(autogen, &root, pass1, NULL);