coreboot-gerrit July 2013

coreboot-gerrit@coreboot.org

1 participants
1030 discussions

Patch merged into coreboot/master: 2a66d6b FOX_WTM2: First pass at FUI.
by gerrit＠coreboot.org 09 Jul '13

09 Jul '13

the following patch was just integrated into master: commit 2a66d6b804acd22fddc2e51550ba39d2561c1234 Author: Ronald G. Minnich <rminnich(a)google.com> Date: Thu Mar 28 17:01:43 2013 -0700 FOX_WTM2: First pass at FUI. This lights up the display. We don't get graphics but we are missing the gttsetup at this point, so that is no shock. The real shock is that anything works at all. Change-Id: I03fc470334e96878aeb8465044b3cc9c90378735 Signed-off-by: Ronald G. Minnich <rminnich(a)google.com> Signed-off-by: Gabe Black <gabeblack(a)chromium.org> Reviewed-on: http://review.coreboot.org/3634 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> See http://review.coreboot.org/3634 for details. -gerrit

1 0

New patch to review for coreboot: 772ce73 lenovo/t60 lenovo/x60: Default SEABIOS_PS2_TIMEOUT to 3 seconds
by Peter Stuge 09 Jul '13

09 Jul '13

Peter Stuge (peter(a)stuge.se) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3735 -gerrit commit 772ce730585b3e4c4c6d40b981499d6eec5866ea Author: Peter Stuge <peter(a)stuge.se> Date: Tue Jul 9 20:17:28 2013 +0200 lenovo/t60 lenovo/x60: Default SEABIOS_PS2_TIMEOUT to 3 seconds The ThinkPad keyboard controller sometimes needs a while in order to initialize, so let's ask SeaBIOS to wait for it. This change ensures that the internal keyboard always functions correctly on the ThinkPad when coreboot is built with SeaBIOS as payload. Change-Id: I562475ec98b0c1f5d0debf6e9b597748a420f068 Signed-off-by: Peter Stuge <peter(a)stuge.se> --- src/mainboard/lenovo/t60/Kconfig | 4 ++++ src/mainboard/lenovo/x60/Kconfig | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/mainboard/lenovo/t60/Kconfig b/src/mainboard/lenovo/t60/Kconfig index e5d17b8..0f0670e 100644 --- a/src/mainboard/lenovo/t60/Kconfig +++ b/src/mainboard/lenovo/t60/Kconfig @@ -54,4 +54,8 @@ config MAINBOARD_SMBIOS_MANUFACTURER string default "LENOVO" +config SEABIOS_PS2_TIMEOUT + int + default 3000 + endif diff --git a/src/mainboard/lenovo/x60/Kconfig b/src/mainboard/lenovo/x60/Kconfig index 1a765fb..72aeef8 100644 --- a/src/mainboard/lenovo/x60/Kconfig +++ b/src/mainboard/lenovo/x60/Kconfig @@ -58,4 +58,8 @@ config MAINBOARD_SMBIOS_MANUFACTURER string default "LENOVO" +config SEABIOS_PS2_TIMEOUT + int + default 3000 + endif

1 0

New patch to review for coreboot: 7df6f45 payload/SeaBIOS: Add SEABIOS_PS2_TIMEOUT Kconfig variable
by Peter Stuge 09 Jul '13

09 Jul '13

Peter Stuge (peter(a)stuge.se) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3734 -gerrit commit 7df6f45dfd49d58cb7d5d89b61d0b8928cdb76d5 Author: Peter Stuge <peter(a)stuge.se> Date: Tue Jul 9 19:43:09 2013 +0200 payload/SeaBIOS: Add SEABIOS_PS2_TIMEOUT Kconfig variable This allows mainboards to preconfigure a ps2-keyboard-spinup timeout when SeaBIOS is chosen as the payload. The Kconfig option can be changed manually if CONFIG_EXPERT is set. Change-Id: I5732b18ef04f4bdef6236f35039656ad02011aec Signed-off-by: Peter Stuge <peter(a)stuge.se> --- src/Kconfig | 9 +++++++++ src/arch/x86/Makefile.inc | 6 ++++++ 2 files changed, 15 insertions(+) diff --git a/src/Kconfig b/src/Kconfig index fdf40e5..e3b2728 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -572,6 +572,15 @@ config SEABIOS_MASTER Newest SeaBIOS version endchoice +config SEABIOS_PS2_TIMEOUT + prompt "PS/2 keyboard controller initialization timeout (milliseconds)" if PAYLOAD_SEABIOS + depends on EXPERT + int + help + Some PS/2 keyboard controllers don't respond to commands immediately + after powering on. This specifies how long SeaBIOS will wait for the + keyboard controller to become ready before giving up. + choice prompt "FILO version" default FILO_STABLE diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index 7f1b7b2..0989adf 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -87,6 +87,12 @@ endif ifeq ($(CONFIG_PAYLOAD_SEABIOS),y) @printf " PAYLOAD SeaBIOS (internal, compression: $(CBFS_PAYLOAD_COMPRESS_FLAG))\n" $(CBFSTOOL) $@.tmp add-payload -f $(CONFIG_PAYLOAD_FILE) -n $(CONFIG_CBFS_PREFIX)/payload -c $(CBFS_PAYLOAD_COMPRESS_FLAG) +ifneq ($(CONFIG_SEABIOS_PS2_TIMEOUT),) +ifneq ($(CONFIG_SEABIOS_PS2_TIMEOUT),0) + @printf " SeaBIOS Wait up to $(CONFIG_SEABIOS_PS2_TIMEOUT) ms for PS/2 keyboard controller initialization\n" + $(CBFSTOOL) $@.tmp add-int -i $(CONFIG_SEABIOS_PS2_TIMEOUT) -n etc/ps2-keyboard-spinup +endif +endif endif ifeq ($(CONFIG_PAYLOAD_FILO),y) @printf " PAYLOAD FILO (internal, compression: $(CBFS_PAYLOAD_COMPRESS_FLAG))\n"

1 0

New patch to review for coreboot: 28ea428 cbfstool: Add an add-int command that adds a raw 64-bit integer CBFS file
by Peter Stuge 09 Jul '13

09 Jul '13

Peter Stuge (peter(a)stuge.se) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3733 -gerrit commit 28ea428c13ed8de12fba23ef1095709af90462e2 Author: Peter Stuge <peter(a)stuge.se> Date: Tue Jul 9 19:39:13 2013 +0200 cbfstool: Add an add-int command that adds a raw 64-bit integer CBFS file This simplifies storing SeaBIOS parameters in CBFS. Change-Id: I301644ba0d7a9cb5917c37a3b4ceddfa59e34e77 Signed-off-by: Peter Stuge <peter(a)stuge.se> --- util/cbfstool/cbfstool.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c index bd34960..fc49ed2 100644 --- a/util/cbfstool/cbfstool.c +++ b/util/cbfstool/cbfstool.c @@ -42,6 +42,7 @@ static struct param { char *name; char *filename; char *bootblock; + uint64_t u64val; uint32_t type; uint32_t baseaddress; uint32_t baseaddress_assigned; @@ -63,6 +64,50 @@ static struct param { typedef int (*convert_buffer_t)(struct buffer *buffer, uint32_t *offset); +static int cbfs_add_integer_component(const char *cbfs_name, + const char *name, + uint64_t u64val, + uint32_t offset) { + struct cbfs_image image; + struct buffer buffer; + int i, ret = 1; + + if (!name) { + ERROR("You need to specify -n/--name.\n"); + return 1; + } + + if (buffer_create(&buffer, 8, name) != 0) + return 1; + + for (i = 0; i < 8; i++) + buffer.data[i] = (u64val >> i*8) & 0xff; + + if (cbfs_image_from_file(&image, cbfs_name) != 0) { + ERROR("Could not load ROM image '%s'.\n", cbfs_name); + buffer_delete(&buffer); + return 1; + } + + if (cbfs_get_entry(&image, name)) { + ERROR("'%s' already in ROM image.\n", name); + goto done; + } + + if (cbfs_add_entry(&image, &buffer, name, CBFS_COMPONENT_RAW, param.baseaddress) != 0) { + ERROR("Failed to add %llu into ROM image as '%s'.\n", (long long unsigned)u64val, name); + goto done; + } + + if (cbfs_image_write_file(&image, cbfs_name) == 0) + ret = 0; + +done: + buffer_delete(&buffer); + cbfs_image_delete(&image); + return ret; +} + static int cbfs_add_component(const char *cbfs_name, const char *filename, const char *name, @@ -227,6 +272,14 @@ static int cbfs_add_flat_binary(void) cbfstool_convert_mkflatpayload); } +static int cbfs_add_integer(void) +{ + return cbfs_add_integer_component(param.cbfs_name, + param.name, + param.u64val, + param.baseaddress); +} + static int cbfs_remove(void) { struct cbfs_image image; @@ -452,6 +505,7 @@ static const struct command commands[] = { {"add-payload", "f:n:t:c:b:vh?", cbfs_add_payload}, {"add-stage", "f:n:t:c:b:vh?", cbfs_add_stage}, {"add-flat-binary", "f:n:l:e:c:b:vh?", cbfs_add_flat_binary}, + {"add-int", "i:n:b:vh?", cbfs_add_integer}, {"remove", "n:vh?", cbfs_remove}, {"create", "s:B:b:H:a:o:m:vh?", cbfs_create}, {"locate", "f:n:P:a:Tvh?", cbfs_locate}, @@ -474,6 +528,7 @@ static struct option long_options[] = { {"page-size", required_argument, 0, 'P' }, {"offset", required_argument, 0, 'o' }, {"file", required_argument, 0, 'f' }, + {"int", required_argument, 0, 'i' }, {"machine", required_argument, 0, 'm' }, {"empty-fits", required_argument, 0, 'x' }, {"verbose", no_argument, 0, 'v' }, @@ -500,6 +555,8 @@ static void usage(char *name) " add-flat-binary -f FILE -n NAME -l load-address \\\n" " -e entry-point [-c compression] [-b base] " "Add a 32bit flat mode binary\n" + " add-int -i INTEGER -n NAME [-b base] " + "Add a raw 64-bit integer value\n" " remove -n NAME " "Remove a component\n" " create -s size -B bootblock -m ARCH [-a align] [-o offset] " @@ -619,6 +676,9 @@ int main(int argc, char **argv) case 'f': param.filename = optarg; break; + case 'i': + param.u64val = strtoull(optarg, NULL, 0); + break; case 'T': param.top_aligned = 1; break;

1 0

New patch to review for coreboot: bc22fa5 SMBIOS: Clarify prompts and help texts for Serial and Version numbers
by Peter Stuge 09 Jul '13

09 Jul '13

Peter Stuge (peter(a)stuge.se) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3732 -gerrit commit bc22fa5573bb574080fe3f6a564c5ee9403dac54 Author: Peter Stuge <peter(a)stuge.se> Date: Tue Jul 9 19:37:20 2013 +0200 SMBIOS: Clarify prompts and help texts for Serial and Version numbers Change-Id: If1fa39db79eeecbef90c8695143d2fe2adf2f21a Signed-off-by: Peter Stuge <peter(a)stuge.se> --- src/mainboard/Kconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mainboard/Kconfig b/src/mainboard/Kconfig index a8cf362..3f5c673 100644 --- a/src/mainboard/Kconfig +++ b/src/mainboard/Kconfig @@ -335,18 +335,18 @@ config ENABLE_POWER_BUTTON def_bool n if !POWER_BUTTON_IS_OPTIONAL && POWER_BUTTON_FORCE_DISABLE config MAINBOARD_SERIAL_NUMBER - string "Serial number" + string "SMBIOS Serial number" depends on GENERATE_SMBIOS_TABLES default "123456789" help - Define the used serial number which will be used by SMBIOS tables. + The Serial Number to store in SMBIOS structures. config MAINBOARD_VERSION - string "Version number" + string "SMBIOS Version number" depends on GENERATE_SMBIOS_TABLES default "1.0" help - Define the used version number which will be used by SMBIOS tables. + The Version Number to store in SMBIOS structures. config MAINBOARD_SMBIOS_MANUFACTURER string "SMBIOS Manufacturer"

1 0

New patch to review for coreboot: 94f322d lenovo/t60 lenovo/x60: Override SMBIOS Manufacturer to be LENOVO
by Peter Stuge 09 Jul '13

09 Jul '13

Peter Stuge (peter(a)stuge.se) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3731 -gerrit commit 94f322dbff45bd3586701f1ffe349b1a6738efb0 Author: Peter Stuge <peter(a)stuge.se> Date: Tue Jul 9 20:44:52 2013 +0200 lenovo/t60 lenovo/x60: Override SMBIOS Manufacturer to be LENOVO This is needed for the Linux thinkpad_acpi.c driver to load. Change-Id: I3d9549395556ffb0abfc3cb52b3d01386c34caa5 Signed-off-by: Peter Stuge <peter(a)stuge.se> --- src/mainboard/lenovo/t60/Kconfig | 4 ++++ src/mainboard/lenovo/x60/Kconfig | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/mainboard/lenovo/t60/Kconfig b/src/mainboard/lenovo/t60/Kconfig index bf24db7..e5d17b8 100644 --- a/src/mainboard/lenovo/t60/Kconfig +++ b/src/mainboard/lenovo/t60/Kconfig @@ -50,4 +50,8 @@ config MAX_CPUS int default 2 +config MAINBOARD_SMBIOS_MANUFACTURER + string + default "LENOVO" + endif diff --git a/src/mainboard/lenovo/x60/Kconfig b/src/mainboard/lenovo/x60/Kconfig index bcf5e04..1a765fb 100644 --- a/src/mainboard/lenovo/x60/Kconfig +++ b/src/mainboard/lenovo/x60/Kconfig @@ -54,4 +54,8 @@ config MAX_CPUS int default 2 +config MAINBOARD_SMBIOS_MANUFACTURER + string + default "LENOVO" + endif

1 0

Patch set updated for coreboot: 494781d ec/lenovo/h8: Add h8_build_id_and_function_spec_version()
by Peter Stuge 09 Jul '13

09 Jul '13

Peter Stuge (peter(a)stuge.se) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3617 -gerrit commit 494781d6d21fba3725c0d8ff150c756b5d8402eb Author: Peter Stuge <peter(a)stuge.se> Date: Sat Jul 6 19:44:47 2013 +0200 ec/lenovo/h8: Add h8_build_id_and_function_spec_version() The function reads the Build ID and the supported function specification version from the running EC firmware, and stores a text representation in the provided output buffer. Change-Id: I3b647d7f315c9b4922fa9a9c5167a80f6d82e753 Signed-off-by: Peter Stuge <peter(a)stuge.se> --- src/ec/lenovo/h8/h8.c | 38 +++++++++++++++++++++++++++++--------- src/ec/lenovo/h8/h8.h | 1 + 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/src/ec/lenovo/h8/h8.c b/src/ec/lenovo/h8/h8.c index 9ffdfc1..2a52b78 100644 --- a/src/ec/lenovo/h8/h8.c +++ b/src/ec/lenovo/h8/h8.c @@ -26,6 +26,7 @@ #include "h8.h" #include "chip.h" #include <pc80/mc146818rtc.h> +#include <string.h> static void h8_bluetooth_enable(int on) { @@ -52,17 +53,12 @@ void h8_wlan_enable(int on) static void h8_log_ec_version(void) { - unsigned char ecfw[9], c; + char ecfw[17]; + u8 len; u16 fwvh, fwvl; - int i; - for(i = 0; i < 8; i++) { - c = ec_read(0xf0 + i); - if (c < 0x20 || c > 0x7f) - break; - ecfw[i] = c; - } - ecfw[i] = '\0'; + len = h8_build_id_and_function_spec_version(ecfw, sizeof ecfw); + ecfw[len] = 0; fwvh = ec_read(0xe9); fwvl = ec_read(0xe8); @@ -109,6 +105,30 @@ int h8_ultrabay_device_present(void) return ec_read(H8_STATUS1) & 0x5 ? 0 : 1; } +u8 h8_build_id_and_function_spec_version(char *buf, u8 buf_len) +{ + u8 i, c; + char str[16 + 1]; /* 16 ASCII chars + \0 */ + + /* Build ID */ + for (i = 0; i < 8; i++) { + c = ec_read(0xf0 + i); + if (c < 0x20 || c > 0x7f) { + i = sprintf(str, "*INVALID"); + break; + } + str[i] = c; + } + + /* EC firmware function specification version */ + i += sprintf(str + i, "-%u.%u", ec_read(0xef), ec_read(0xeb)); + + i = MIN(buf_len, i); + memcpy(buf, str, i); + + return i; +} + static void h8_enable(device_t dev) { struct ec_lenovo_h8_config *conf = dev->chip_info; diff --git a/src/ec/lenovo/h8/h8.h b/src/ec/lenovo/h8/h8.h index 7379fc7..061a213 100644 --- a/src/ec/lenovo/h8/h8.h +++ b/src/ec/lenovo/h8/h8.h @@ -27,6 +27,7 @@ void h8_usb_power_enable(int on); void h8_enable_event(int event); void h8_disable_event(int event); int h8_ultrabay_device_present(void); +u8 h8_build_id_and_function_spec_version(char *buf, u8 buf_len); /* EC registers */ #define H8_CONFIG0 0x00

1 0

Patch set updated for coreboot: 0bda8a1 lenovo/x60: Move mainboard_enable() code into a mainboard_init()
by Peter Stuge 09 Jul '13

09 Jul '13

Peter Stuge (peter(a)stuge.se) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3619 -gerrit commit 0bda8a1a54c9916e277a7e2525907a616e51b7b1 Author: Peter Stuge <peter(a)stuge.se> Date: Sat Jul 6 20:05:13 2013 +0200 lenovo/x60: Move mainboard_enable() code into a mainboard_init() mainboard_enable() is now modelled after google/parrot where the enable function only sets dev->ops->init for the root device to point to a mainboard_init() function, which in turn is called in a later pass over the device tree to do the actual initialization. Change-Id: Iaf9187532a1e432b991260201b95dda85cc312c5 Signed-off-by: Peter Stuge <peter(a)stuge.se> --- src/mainboard/lenovo/x60/mainboard.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/mainboard/lenovo/x60/mainboard.c b/src/mainboard/lenovo/x60/mainboard.c index d2d0733..b344ccb 100644 --- a/src/mainboard/lenovo/x60/mainboard.c +++ b/src/mainboard/lenovo/x60/mainboard.c @@ -85,7 +85,7 @@ int get_cst_entries(acpi_cstate_t **entries) return ARRAY_SIZE(cst_entries); } -static void mainboard_enable(device_t dev) +static void mainboard_init(device_t dev) { device_t dev0, idedev, sdhci_dev; @@ -133,6 +133,11 @@ static void mainboard_enable(device_t dev) } } +static void mainboard_enable(device_t dev) +{ + dev->ops->init = mainboard_init; +} + struct chip_operations mainboard_ops = { .enable_dev = mainboard_enable, };

1 0

Patch set updated for coreboot: 007c888 SMBIOS: Add smbios_write_type11() for creating an OEM Strings structure
by Peter Stuge 09 Jul '13

09 Jul '13

Peter Stuge (peter(a)stuge.se) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3618 -gerrit commit 007c888fe51797001322ba8c94b9aa49628fa21e Author: Peter Stuge <peter(a)stuge.se> Date: Sat Jul 6 19:51:12 2013 +0200 SMBIOS: Add smbios_write_type11() for creating an OEM Strings structure Change-Id: Id338968429435bac26595c4843b07cdbb91dd64d Signed-off-by: Peter Stuge <peter(a)stuge.se> --- src/arch/x86/boot/smbios.c | 18 ++++++++++++++++++ src/include/smbios.h | 10 ++++++++++ 2 files changed, 28 insertions(+) diff --git a/src/arch/x86/boot/smbios.c b/src/arch/x86/boot/smbios.c index 073c7c5..901a209 100644 --- a/src/arch/x86/boot/smbios.c +++ b/src/arch/x86/boot/smbios.c @@ -256,6 +256,24 @@ static int smbios_write_type4(unsigned long *current, int handle) return len; } +int smbios_write_type11(unsigned long *current, int handle, const char **oem_strings, int count) +{ + struct smbios_type11 *t = (struct smbios_type11 *)*current; + int i, len; + + memset(t, 0, sizeof *t); + t->type = SMBIOS_OEM_STRINGS; + t->handle = handle; + t->length = len = sizeof *t - 2; + + for (i = 0; i < count; i++) + t->count = smbios_add_string(t->eos, oem_strings[i]); + + len += smbios_string_table_len(t->eos); + *current += len; + return len; +} + static int smbios_write_type32(unsigned long *current, int handle) { struct smbios_type32 *t = (struct smbios_type32 *)*current; diff --git a/src/include/smbios.h b/src/include/smbios.h index 50bce2a..9051a69 100644 --- a/src/include/smbios.h +++ b/src/include/smbios.h @@ -3,6 +3,7 @@ #include <types.h> +int smbios_write_type11(unsigned long *current, int handle, const char **oem_strings, int count); unsigned long smbios_write_tables(unsigned long start); int smbios_add_string(char *start, const char *str); int smbios_string_table_len(char *start); @@ -31,6 +32,7 @@ typedef enum { SMBIOS_PROCESSOR_INFORMATION=4, SMBIOS_CACHE_INFORMATION=7, SMBIOS_SYSTEM_SLOTS=9, + SMBIOS_OEM_STRINGS=11, SMBIOS_EVENT_LOG=15, SMBIOS_PHYS_MEMORY_ARRAY=16, SMBIOS_MEMORY_DEVICE=17, @@ -142,6 +144,14 @@ struct smbios_type4 { char eos[2]; } __attribute__((packed)); +struct smbios_type11 { + u8 type; + u8 length; + u16 handle; + u8 count; + char eos[2]; +} __attribute__((packed)); + struct smbios_type15 { u8 type; u8 length;

1 0

Patch set updated for coreboot: e0bc0ed lenovo/x60: Add "IBM ThinkPad Embedded Controller" SMBIOS OEM String
by Peter Stuge 09 Jul '13

09 Jul '13

Peter Stuge (peter(a)stuge.se) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3620 -gerrit commit e0bc0ed8b096de4953cf76012a765952a1e29be0 Author: Peter Stuge <peter(a)stuge.se> Date: Sat Jul 6 20:10:36 2013 +0200 lenovo/x60: Add "IBM ThinkPad Embedded Controller" SMBIOS OEM String The Linux thinkpad_acpi.c driver looks for this string while reading information about the system it is running on. This commit does not make the module load but it is one of several things that the module looks for on a ThinkPad. Change-Id: Ief5f28d2e27bf959cb579c4c8eea9eecc9a89a7c Signed-off-by: Peter Stuge <peter(a)stuge.se> --- src/mainboard/lenovo/x60/mainboard.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/mainboard/lenovo/x60/mainboard.c b/src/mainboard/lenovo/x60/mainboard.c index b344ccb..f4c5a34 100644 --- a/src/mainboard/lenovo/x60/mainboard.c +++ b/src/mainboard/lenovo/x60/mainboard.c @@ -36,6 +36,7 @@ #include <pc80/mc146818rtc.h> #include "dock.h" #include <arch/x86/include/arch/acpigen.h> +#include <smbios.h> #include <x86emu/x86emu.h> #define PANEL INT15_5F35_CL_DISPLAY_DEFAULT @@ -133,9 +134,24 @@ 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; +} + 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 = {

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit July 2013