diff options
| author | Andrew McRae <amcrae@google.com> | 2022-03-10 13:53:08 +1100 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2022-03-10 07:49:22 +0000 |
| commit | 8bf3881676f207cba4d8bad52af63add72464f9a (patch) | |
| tree | bf72a7c78b3c4da3a9066d756a3a988bd80ba6f8 /zephyr | |
| parent | 4cd95ce28ba93a8f54ec60deb5b6584799a9cc53 (diff) | |
| download | chrome-ec-8bf3881676f207cba4d8bad52af63add72464f9a.tar.gz | |
zephyr: Add subsys under the app library
Add the subsys directory under the app library so that the
include paths are correctly set.
Also change the source file additions to add them to a
library rather than zephyr_sources, which will attempt to
build them as a zephyr main file.
BUG=b:223697679
TEST=zmake build nivviks
BRANCH=none
Signed-off-by: Andrew McRae <amcrae@google.com>
Change-Id: I2b7f7e17c532462b49dfb1c23b5fc11bd9109530
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3514429
Reviewed-by: Peter Marheine <pmarheine@chromium.org>
Diffstat (limited to 'zephyr')
| -rw-r--r-- | zephyr/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | zephyr/subsys/ap_pwrseq/CMakeLists.txt | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt index 9968866c44..02411ecdbb 100644 --- a/zephyr/CMakeLists.txt +++ b/zephyr/CMakeLists.txt @@ -106,6 +106,8 @@ if (DEFINED CONFIG_PLATFORM_EC) "${PLATFORM_EC}/third_party") endif() +add_subdirectory("subsys") + # Creates a phony target all.libraries in case you only want to build the # libraries and not the binaries. For example for creating the initial zero # coverage files. @@ -509,5 +511,4 @@ add_subdirectory(linker) add_subdirectory("app") add_subdirectory("drivers") add_subdirectory("emul") -add_subdirectory("subsys") add_subdirectory_ifdef(CONFIG_PLATFORM_EC "shim") diff --git a/zephyr/subsys/ap_pwrseq/CMakeLists.txt b/zephyr/subsys/ap_pwrseq/CMakeLists.txt index 33276b0205..8e92a92691 100644 --- a/zephyr/subsys/ap_pwrseq/CMakeLists.txt +++ b/zephyr/subsys/ap_pwrseq/CMakeLists.txt @@ -1,6 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 -zephyr_include_directories(include) +zephyr_library_include_directories(include) zephyr_library_sources( ap_pwrseq_chipset_api.c power_signals.c @@ -8,8 +8,9 @@ zephyr_library_sources( signal_vw.c signal_adc.c ) -zephyr_sources_ifdef(CONFIG_X86_NON_DSX_PWRSEQ +zephyr_library_sources_ifdef(CONFIG_X86_NON_DSX_PWRSEQ x86_non_dsx_common_pwrseq_sm_handler.c) -zephyr_sources_ifdef(CONFIG_X86_NON_DSX_PWRSEQ_CONSOLE +zephyr_library_sources_ifdef(CONFIG_X86_NON_DSX_PWRSEQ_CONSOLE x86_non_dsx_common_pwrseq_console.c) -zephyr_sources_ifdef(CONFIG_X86_NON_DSX_PWRSEQ_ADL x86_non_dsx_adlp_pwrseq_sm.c) +zephyr_library_sources_ifdef(CONFIG_X86_NON_DSX_PWRSEQ_ADL + x86_non_dsx_adlp_pwrseq_sm.c) |