summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Short <keithshort@chromium.org>2022-02-11 15:42:40 -0700
committerCommit Bot <commit-bot@chromium.org>2022-02-25 21:10:00 +0000
commit84fd17247ac8d55ae4adb67281841a9a2a4c2433 (patch)
tree8d0c671e21399736881c4fe125f4999ac1b5a74a
parent969eb75c9050bd3354aa500d416eeeeab9b62f9c (diff)
downloadchrome-ec-84fd17247ac8d55ae4adb67281841a9a2a4c2433.tar.gz
zephyr: move location where system.c is compiled
Move the compilation of common/system.c into the main CMakeLists.txt for the EC application. This ensures all legacy files added to the build from the same place. BUG=b:218856245 BRANCH=none TEST=zmake testall Signed-off-by: Keith Short <keithshort@chromium.org> Change-Id: Ib1771cb859d9b7fa5b0a5f4ed203ae903e0b5ab5 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3489100 Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
-rw-r--r--zephyr/CMakeLists.txt1
-rw-r--r--zephyr/shim/src/CMakeLists.txt1
2 files changed, 1 insertions, 1 deletions
diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt
index d5d1d1c667..ba1672c4ce 100644
--- a/zephyr/CMakeLists.txt
+++ b/zephyr/CMakeLists.txt
@@ -113,6 +113,7 @@ zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC "${PLATFORM_EC}/common/base32.c"
"${PLATFORM_EC}/common/printf.c"
"${PLATFORM_EC}/common/queue.c"
"${PLATFORM_EC}/common/shared_mem.c"
+ "${PLATFORM_EC}/common/system.c"
"${PLATFORM_EC}/common/uart_printf.c"
"${PLATFORM_EC}/common/util.c"
"${PLATFORM_EC}/common/version.c")
diff --git a/zephyr/shim/src/CMakeLists.txt b/zephyr/shim/src/CMakeLists.txt
index 5674986605..5f83d8f3e0 100644
--- a/zephyr/shim/src/CMakeLists.txt
+++ b/zephyr/shim/src/CMakeLists.txt
@@ -16,7 +16,6 @@ if (DEFINED CONFIG_ARCH_POSIX)
else()
zephyr_library_sources(system.c)
endif()
-zephyr_library_sources("${PLATFORM_EC}/common/system.c")
zephyr_library_sources_ifdef(no_libgcc libgcc_${ARCH}.S)