sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ec/lenovo: Add guards to fix build errors without SMBIOS

Browse Source 
Not selecting the Kconfig option `GENERATE_SMBIOS_TABLES` the build
fails with the error below.

```
    CC         ramstage/ec/lenovo/h8/h8.o
src/ec/lenovo/h8/h8.c:201:2: error: unknown field 'get_smbios_strings' specified in initializer
  .get_smbios_strings = h8_smbios_strings,
  ^
src/ec/lenovo/h8/h8.c:201:2: error: initialization from incompatible pointer type [-Werror]
src/ec/lenovo/h8/h8.c:201:2: error: (near initialization for 'h8_dev_ops.read_resources') [-Werror]
cc1: all warnings being treated as errors
```

So add the appropriate preprocessor guards to fix the build error.

Change-Id: I3baed452d422539a805c628a8c4a6a8c2a809317
Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-on: https://review.coreboot.org/17770
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Rudolph <siro@das-labor.org>
This commit is contained in:
Paul Menzel
2016-12-08 00:03:38 +01:00
committed by Martin Roth
parent 18792314d7
commit 2a4a452abc
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ec/lenovo/h8/h8.c
View File

@@ -182,6 +182,7 @@ u8 h8_build_id_and_function_spec_version(char *buf, u8 buf_len)
return i; return i;
} }
#if IS_ENABLED(CONFIG_GENERATE_SMBIOS_TABLES)
static void h8_smbios_strings(struct device *dev, struct smbios_type11 *t) static void h8_smbios_strings(struct device *dev, struct smbios_type11 *t)
{ {
char tpec[] = "IBM ThinkPad Embedded Controller -[ ]-"; char tpec[] = "IBM ThinkPad Embedded Controller -[ ]-";
@@ -190,6 +191,7 @@ static void h8_smbios_strings(struct device *dev, struct smbios_type11 *t)
t->count = smbios_add_string(t->eos, tpec); t->count = smbios_add_string(t->eos, tpec);
} }
#endif
static void h8_init(device_t dev) static void h8_init(device_t dev)
{ {
@@ -197,7 +199,9 @@ static void h8_init(device_t dev)
} }
struct device_operations h8_dev_ops = { struct device_operations h8_dev_ops = {
#if IS_ENABLED(CONFIG_GENERATE_SMBIOS_TABLES)
.get_smbios_strings = h8_smbios_strings, .get_smbios_strings = h8_smbios_strings,
#endif
.init = h8_init, .init = h8_init,
}; };