From 6abb33c7ba5f18ec3e3578cb1f804cbe60e49c49 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Wed, 27 Aug 2014 23:42:45 +0200 Subject: smbios: reorganise OEM strings handling. OEM strings should not be handled by mobo code but by common code with strings collected from all devices. Change-Id: Ibde61a1ca79845670bc0df87dc6c67fa868d48a9 Signed-off-by: Vladimir Serbinenko Reviewed-on: http://review.coreboot.org/6788 Reviewed-by: Edward O'Callaghan Tested-by: build bot (Jenkins) --- src/mainboard/lenovo/t530/mainboard.c | 15 --------------- src/mainboard/lenovo/t60/mainboard.c | 15 --------------- src/mainboard/lenovo/x200/mainboard.c | 15 --------------- src/mainboard/lenovo/x201/mainboard.c | 15 --------------- src/mainboard/lenovo/x220/mainboard.c | 15 --------------- src/mainboard/lenovo/x230/mainboard.c | 15 --------------- src/mainboard/lenovo/x60/mainboard.c | 15 --------------- 7 files changed, 105 deletions(-) (limited to 'src/mainboard') diff --git a/src/mainboard/lenovo/t530/mainboard.c b/src/mainboard/lenovo/t530/mainboard.c index feb1aa78f0..c3425b3d01 100644 --- a/src/mainboard/lenovo/t530/mainboard.c +++ b/src/mainboard/lenovo/t530/mainboard.c @@ -164,27 +164,12 @@ static void mainboard_init(device_t dev) 0x42, 0x142); } -static int mainboard_smbios_data(device_t dev, int *handle, unsigned long *current) -{ - int len; - char tpec[] = "IBM ThinkPad Embedded Controller -[ ]-"; - const char *oem_strings[] = { - tpec, - }; - - h8_build_id_and_function_spec_version(tpec + 35, 17); - len = smbios_write_type11(current, (*handle)++, oem_strings, ARRAY_SIZE(oem_strings)); - - 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 = mainboard_smbios_data; #if CONFIG_VGA_ROM_RUN /* Install custom int15 handler for VGA OPROM */ diff --git a/src/mainboard/lenovo/t60/mainboard.c b/src/mainboard/lenovo/t60/mainboard.c index 6dac819f2e..9c6a30a47c 100644 --- a/src/mainboard/lenovo/t60/mainboard.c +++ b/src/mainboard/lenovo/t60/mainboard.c @@ -129,24 +129,9 @@ static void mainboard_init(device_t dev) ec_write(0x0c, inb(0x164c) & 8 ? 0x89 : 0x09); } -static int mainboard_smbios_data(device_t dev, int *handle, unsigned long *current) -{ - int len; - char tpec[] = "IBM ThinkPad Embedded Controller -[ ]-"; - const char *oem_strings[] = { - tpec, - }; - - h8_build_id_and_function_spec_version(tpec + 35, 17); - len = smbios_write_type11(current, (*handle)++, oem_strings, ARRAY_SIZE(oem_strings)); - - return len; -} - static void mainboard_enable(device_t dev) { dev->ops->init = mainboard_init; - dev->ops->get_smbios_data = mainboard_smbios_data; } struct chip_operations mainboard_ops = { diff --git a/src/mainboard/lenovo/x200/mainboard.c b/src/mainboard/lenovo/x200/mainboard.c index 9fe55db308..df314630ff 100644 --- a/src/mainboard/lenovo/x200/mainboard.c +++ b/src/mainboard/lenovo/x200/mainboard.c @@ -125,20 +125,6 @@ const char *smbios_mainboard_bios_version(void) return "CBET4000 " COREBOOT_VERSION; } -static int mainboard_smbios_data(device_t dev, int *handle, unsigned long *current) -{ - int len; - char tpec[] = "IBM ThinkPad Embedded Controller -[ ]-"; - const char *oem_strings[] = { - tpec, - }; - - h8_build_id_and_function_spec_version(tpec + 35, 17); - len = smbios_write_type11(current, (*handle)++, oem_strings, ARRAY_SIZE(oem_strings)); - - return len; -} - static void mainboard_init(device_t dev) { /* This sneaked in here, because X200 SuperIO chip isn't really @@ -155,7 +141,6 @@ static void mainboard_enable(device_t dev) mainboard_interrupt_handlers(0x15, &int15_handler); #endif - dev->ops->get_smbios_data = mainboard_smbios_data; dev->ops->init = mainboard_init; } diff --git a/src/mainboard/lenovo/x201/mainboard.c b/src/mainboard/lenovo/x201/mainboard.c index 16d4bd9c7d..fd11da8326 100644 --- a/src/mainboard/lenovo/x201/mainboard.c +++ b/src/mainboard/lenovo/x201/mainboard.c @@ -147,27 +147,12 @@ static void mainboard_init(device_t dev) 0x42, 0x142); } -static int mainboard_smbios_data(device_t dev, int *handle, unsigned long *current) -{ - int len; - char tpec[] = "IBM ThinkPad Embedded Controller -[ ]-"; - const char *oem_strings[] = { - tpec, - }; - - h8_build_id_and_function_spec_version(tpec + 35, 17); - len = smbios_write_type11(current, (*handle)++, oem_strings, ARRAY_SIZE(oem_strings)); - - return len; -} - static void mainboard_enable(device_t dev) { device_t dev0; u16 pmbase; dev->ops->init = mainboard_init; - dev->ops->get_smbios_data = mainboard_smbios_data; pmbase = pci_read_config32(dev_find_slot(0, PCI_DEVFN(0x1f, 0)), PMBASE) & 0xff80; diff --git a/src/mainboard/lenovo/x220/mainboard.c b/src/mainboard/lenovo/x220/mainboard.c index 7bc1edbe8d..28cd8142dc 100644 --- a/src/mainboard/lenovo/x220/mainboard.c +++ b/src/mainboard/lenovo/x220/mainboard.c @@ -174,27 +174,12 @@ static void mainboard_init(device_t dev) 0x42, 0x142); } -static int mainboard_smbios_data(device_t dev, int *handle, unsigned long *current) -{ - int len; - char tpec[] = "IBM ThinkPad Embedded Controller -[ ]-"; - const char *oem_strings[] = { - tpec, - }; - - h8_build_id_and_function_spec_version(tpec + 35, 17); - len = smbios_write_type11(current, (*handle)++, oem_strings, ARRAY_SIZE(oem_strings)); - - 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 = mainboard_smbios_data; #if CONFIG_VGA_ROM_RUN /* Install custom int15 handler for VGA OPROM */ diff --git a/src/mainboard/lenovo/x230/mainboard.c b/src/mainboard/lenovo/x230/mainboard.c index 323f37faed..c017712855 100644 --- a/src/mainboard/lenovo/x230/mainboard.c +++ b/src/mainboard/lenovo/x230/mainboard.c @@ -174,27 +174,12 @@ static void mainboard_init(device_t dev) 0x42, 0x142); } -static int mainboard_smbios_data(device_t dev, int *handle, unsigned long *current) -{ - int len; - char tpec[] = "IBM ThinkPad Embedded Controller -[ ]-"; - const char *oem_strings[] = { - tpec, - }; - - h8_build_id_and_function_spec_version(tpec + 35, 17); - len = smbios_write_type11(current, (*handle)++, oem_strings, ARRAY_SIZE(oem_strings)); - - 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 = mainboard_smbios_data; #if CONFIG_VGA_ROM_RUN /* Install custom int15 handler for VGA OPROM */ diff --git a/src/mainboard/lenovo/x60/mainboard.c b/src/mainboard/lenovo/x60/mainboard.c index cc89047402..4472c0b168 100644 --- a/src/mainboard/lenovo/x60/mainboard.c +++ b/src/mainboard/lenovo/x60/mainboard.c @@ -136,20 +136,6 @@ static void mainboard_init(device_t dev) } } -static int mainboard_smbios_data(device_t dev, int *handle, unsigned long *current) -{ - int len; - char tpec[] = "IBM ThinkPad Embedded Controller -[ ]-"; - const char *oem_strings[] = { - tpec, - }; - - h8_build_id_and_function_spec_version(tpec + 35, 17); - len = smbios_write_type11(current, (*handle)++, oem_strings, ARRAY_SIZE(oem_strings)); - - return len; -} - const char *smbios_mainboard_bios_version(void) { /* Satisfy thinkpad_acpi. */ @@ -162,7 +148,6 @@ const char *smbios_mainboard_bios_version(void) static void mainboard_enable(device_t dev) { dev->ops->init = mainboard_init; - dev->ops->get_smbios_data = mainboard_smbios_data; } struct chip_operations mainboard_ops = { -- cgit v1.2.3