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

Drop get_smbios_data from chip_operations 

We only want to add data once per device. Using the one in
chip_operations is not very usable anyway, as different
devices under the same chip directory would need to output
entirely different sets of data.

Change-Id: I96690c4c699667343ebef44a7f3de1f974cf6d6d
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/1492
Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
Tested-by: build bot (Jenkins)
This commit is contained in:
Kyösti Mälkki 2012-08-28 07:49:49 +03:00 committed by Stefan Reinauer
parent 23c046b6f1
commit 9ead80f870
3 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/arch/x86/boot/smbios.c
View File

@ -282,9 +282,6 @@ static int smbios_walk_device_tree(device_t tree, int *handle, unsigned long *cu
if (dev->ops && dev->ops->get_smbios_data) if (dev->ops && dev->ops->get_smbios_data)
len += dev->ops->get_smbios_data(dev, handle, current); len += dev->ops->get_smbios_data(dev, handle, current);
if (dev->chip_ops && dev->chip_ops->get_smbios_data)
len += dev->chip_ops->get_smbios_data(dev, handle, current);
} }
return len; return len;
} }

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

@ -17,9 +17,6 @@ struct smbus_bus_operations;
struct chip_operations { struct chip_operations {
void (*enable_dev)(struct device *dev); void (*enable_dev)(struct device *dev);
const char *name; const char *name;
#if CONFIG_GENERATE_SMBIOS_TABLES
int (*get_smbios_data)(device_t dev, int *handle, unsigned long *current);
#endif
}; };
#define CHIP_NAME(X) .name = X, #define CHIP_NAME(X) .name = X,

28
src/mainboard/samsung/lumpy/mainboard.c
View File

@ -251,19 +251,6 @@ static void mainboard_init(device_t dev)
lumpy_ec_init(); lumpy_ec_init();
} }
// mainboard_enable is executed as first thing after
// enumerate_buses().
static void mainboard_enable(device_t dev)
{
dev->ops->init = mainboard_init;
#if CONFIG_PCI_OPTION_ROM_RUN_YABEL || CONFIG_PCI_OPTION_ROM_RUN_REALMODE
/* Install custom int15 handler for VGA OPROM */
mainboard_interrupt_handlers(0x15, &int15_handler);
#endif
verb_setup();
}
static int lumpy_smbios_type41_irq(int *handle, unsigned long *current, static int lumpy_smbios_type41_irq(int *handle, unsigned long *current,
const char *name, u8 irq, u8 addr) const char *name, u8 irq, u8 addr)
{ {
@ -308,9 +295,22 @@ static int lumpy_onboard_smbios_data(device_t dev, int *handle,
return len; return len;
} }
// mainboard_enable is executed as first thing after
// enumerate_buses().
static void mainboard_enable(device_t dev)
{
dev->ops->init = mainboard_init;
dev->ops->get_smbios_data = lumpy_onboard_smbios_data;
#if CONFIG_PCI_OPTION_ROM_RUN_YABEL || CONFIG_PCI_OPTION_ROM_RUN_REALMODE
/* Install custom int15 handler for VGA OPROM */
mainboard_interrupt_handlers(0x15, &int15_handler);
#endif
verb_setup();
}
struct chip_operations mainboard_ops = { struct chip_operations mainboard_ops = {
CHIP_NAME("Samsung Lumpy ChromeBook") CHIP_NAME("Samsung Lumpy ChromeBook")
.enable_dev = mainboard_enable, .enable_dev = mainboard_enable,
.get_smbios_data = lumpy_onboard_smbios_data,
}; };