summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Rosenthal <jrosenth@chromium.org>2021-03-10 15:19:16 -0700
committerCommit Bot <commit-bot@chromium.org>2021-03-11 17:09:06 +0000
commit066a44c9feda71a941c8cdc96b29b5327269ba2d (patch)
tree7324a46914263675a836a79c38e35cbf80c24fc4
parent1e58403e50bb17b2301845c4a3509a569f54e654 (diff)
downloadchrome-ec-066a44c9feda71a941c8cdc96b29b5327269ba2d.tar.gz
zephyr: don't make ec_features.c depend on ACPI
ACPI is a concept of the x86 world only, but ARM devices require ec_features.c as well. Compile ec_features.c under the common CONFIG_PLATFORM_EC option. BUG=b:182398910 BRANCH=none TEST=compile lazor with host commands Signed-off-by: Jack Rosenthal <jrosenth@chromium.org> Change-Id: Ic06d6ed26015de9ef7e26f6f5554ac3fb4e92f47 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2749423 Reviewed-by: Keith Short <keithshort@chromium.org>
-rw-r--r--zephyr/CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt
index 120ee40ad6..214c2ccf7e 100644
--- a/zephyr/CMakeLists.txt
+++ b/zephyr/CMakeLists.txt
@@ -148,6 +148,7 @@ add_subdirectory_ifdef(CONFIG_PLATFORM_EC "shim")
# layer.
zephyr_sources_ifdef(CONFIG_PLATFORM_EC "${PLATFORM_EC}/common/base32.c"
"${PLATFORM_EC}/common/console_output.c"
+ "${PLATFORM_EC}/common/ec_features.c"
"${PLATFORM_EC}/common/gpio_commands.c"
"${PLATFORM_EC}/common/peripheral.c"
"${PLATFORM_EC}/common/printf.c"
@@ -170,8 +171,7 @@ zephyr_sources_ifdef(CONFIG_PLATFORM_EC_ACCEL_FIFO
zephyr_sources_ifdef(CONFIG_PLATFORM_EC_ADC_CMD "${PLATFORM_EC}/common/adc.c")
zephyr_sources_ifdef(CONFIG_PLATFORM_EC_ALS_TCS3400
"${PLATFORM_EC}/driver/als_tcs3400.c")
-zephyr_sources_ifdef(CONFIG_PLATFORM_EC_ACPI "${PLATFORM_EC}/common/acpi.c"
- "${PLATFORM_EC}/common/ec_features.c")
+zephyr_sources_ifdef(CONFIG_PLATFORM_EC_ACPI "${PLATFORM_EC}/common/acpi.c")
zephyr_sources_ifdef(CONFIG_PLATFORM_EC_BACKLIGHT_LID
"${PLATFORM_EC}/common/backlight_lid.c")
zephyr_sources_ifdef(CONFIG_PLATFORM_EC_BATTERY "${PLATFORM_EC}/common/battery.c")