summaryrefslogtreecommitdiff
path: root/src/ec/lenovo
diff options
context:
space:
mode:
authorJulius Werner <jwerner@chromium.org>2019-03-05 16:53:33 -0800
committerPatrick Georgi <pgeorgi@google.com>2019-03-08 08:33:24 +0000
commitcd49cce7b70e80b4acc49b56bb2bb94370b4d867 (patch)
tree8e89136e2da7cf54453ba8c112eda94415b56242 /src/ec/lenovo
parentb3a8cc54dbaf833c590a56f912209a5632b71f49 (diff)
coreboot: Replace all IS_ENABLED(CONFIG_XXX) with CONFIG(XXX)
This patch is a raw application of find src/ -type f | xargs sed -i -e 's/IS_ENABLED\s*(CONFIG_/CONFIG(/g' Change-Id: I6262d6d5c23cabe23c242b4f38d446b74fe16b88 Signed-off-by: Julius Werner <jwerner@chromium.org> Reviewed-on: https://review.coreboot.org/c/coreboot/+/31774 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/ec/lenovo')
-rw-r--r--src/ec/lenovo/h8/acpi/thinkpad.asl2
-rw-r--r--src/ec/lenovo/h8/h8.c12
-rw-r--r--src/ec/lenovo/h8/panic.c4
3 files changed, 9 insertions, 9 deletions
diff --git a/src/ec/lenovo/h8/acpi/thinkpad.asl b/src/ec/lenovo/h8/acpi/thinkpad.asl
index 449fd6ee61..7f592c1bbf 100644
--- a/src/ec/lenovo/h8/acpi/thinkpad.asl
+++ b/src/ec/lenovo/h8/acpi/thinkpad.asl
@@ -318,7 +318,7 @@ Device (HKEY)
}
}
- #if IS_ENABLED(CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL)
+ #if CONFIG(H8_HAS_BAT_TRESHOLDS_IMPL)
#include "thinkpad_bat_thresholds.asl"
#endif
}
diff --git a/src/ec/lenovo/h8/h8.c b/src/ec/lenovo/h8/h8.c
index 6e1534c781..de4f2c29b2 100644
--- a/src/ec/lenovo/h8/h8.c
+++ b/src/ec/lenovo/h8/h8.c
@@ -192,7 +192,7 @@ u8 h8_build_id_and_function_spec_version(char *buf, u8 buf_len)
return i;
}
-#if IS_ENABLED(CONFIG_GENERATE_SMBIOS_TABLES)
+#if CONFIG(GENERATE_SMBIOS_TABLES)
static void h8_smbios_strings(struct device *dev, struct smbios_type11 *t)
{
char tpec[] = "IBM ThinkPad Embedded Controller -[ ]-";
@@ -208,7 +208,7 @@ static void h8_init(struct device *dev)
pc_keyboard_init(NO_AUX_DEVICE);
}
-#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)
+#if CONFIG(HAVE_ACPI_TABLES)
static const char *h8_acpi_name(const struct device *dev)
{
return "EC";
@@ -216,10 +216,10 @@ static const char *h8_acpi_name(const struct device *dev)
#endif
struct device_operations h8_dev_ops = {
-#if IS_ENABLED(CONFIG_GENERATE_SMBIOS_TABLES)
+#if CONFIG(GENERATE_SMBIOS_TABLES)
.get_smbios_strings = h8_smbios_strings,
#endif
-#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)
+#if CONFIG(HAVE_ACPI_TABLES)
.acpi_fill_ssdt_generator = h8_ssdt_generator,
.acpi_name = h8_acpi_name,
#endif
@@ -312,7 +312,7 @@ static void h8_enable(struct device *dev)
if (get_option(&val, "volume") == CB_SUCCESS && !acpi_is_wakeup_s3())
ec_write(H8_VOLUME_CONTROL, val);
- val = (IS_ENABLED(CONFIG_H8_SUPPORT_BT_ON_WIFI) || h8_has_bdc(dev)) &&
+ val = (CONFIG(H8_SUPPORT_BT_ON_WIFI) || h8_has_bdc(dev)) &&
h8_bluetooth_nv_enable();
h8_bluetooth_enable(val);
@@ -340,7 +340,7 @@ static void h8_enable(struct device *dev)
h8_set_audio_mute(0);
-#if !IS_ENABLED(CONFIG_H8_DOCK_EARLY_INIT)
+#if !CONFIG(H8_DOCK_EARLY_INIT)
h8_mainboard_init_dock();
#endif
}
diff --git a/src/ec/lenovo/h8/panic.c b/src/ec/lenovo/h8/panic.c
index fbe0dc052c..4981b861db 100644
--- a/src/ec/lenovo/h8/panic.c
+++ b/src/ec/lenovo/h8/panic.c
@@ -19,7 +19,7 @@
static void h8_panic(void)
{
- if (IS_ENABLED(CONFIG_H8_FLASH_LEDS_ON_DEATH)) {
+ if (CONFIG(H8_FLASH_LEDS_ON_DEATH)) {
static const u8 leds[] = {
H8_LED_CONTROL_POWER_LED,
H8_LED_CONTROL_BAT0_LED,
@@ -37,7 +37,7 @@ static void h8_panic(void)
ec_write(H8_LED_CONTROL,
H8_LED_CONTROL_BLINK | leds[i]);
}
- if (IS_ENABLED(CONFIG_H8_BEEP_ON_DEATH)) {
+ if (CONFIG(H8_BEEP_ON_DEATH)) {
/* Beep 4 Sec. 1250 Hz */
ec_write(H8_SOUND_ENABLE1, 4);
ec_write(H8_SOUND_REPEAT, 1);