diff options
| author | Yuval Peress <peress@google.com> | 2022-07-19 16:34:03 +0000 |
|---|---|---|
| committer | CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-07-19 16:34:03 +0000 |
| commit | bba19361f7a3ae27bfb6ecab1444c847d21a6b94 (patch) | |
| tree | d7577cb9ff00d7bbcbf50c49fc34f6d096086396 /pw_chrono_zephyr | |
| parent | 18e775966d11b9356c735e0847e0ed3a6c4498ca (diff) | |
| download | pigweed-bba19361f7a3ae27bfb6ecab1444c847d21a6b94.tar.gz | |
zephyr: fix build for chameleon and ToT Zephyr
- Fix incorrect 'IMPLEMENTS_FACADE' which got away from me in code
review.
- Update the zephyr implementation of pw_assert
- Fix selection of backends to happen at config time before including
facades
- Update Kconfigs to stop using menus which ended up just making things
confusing.
- Fix some missing 'select' statements in Kconfigs
Signed-off-by: Yuval Peress <peress@google.com>
Change-Id: I4b830481f62aa27932df4ef5fc19233719f69c74
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/102542
Reviewed-by: Paul Fagerburg <pfagerburg@google.com>
Reviewed-by: Ewout van Bekkum <ewout@google.com>
Diffstat (limited to 'pw_chrono_zephyr')
| -rw-r--r-- | pw_chrono_zephyr/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | pw_chrono_zephyr/Kconfig | 9 |
2 files changed, 2 insertions, 10 deletions
diff --git a/pw_chrono_zephyr/CMakeLists.txt b/pw_chrono_zephyr/CMakeLists.txt index ad979c9eb..41ff01edc 100644 --- a/pw_chrono_zephyr/CMakeLists.txt +++ b/pw_chrono_zephyr/CMakeLists.txt @@ -14,14 +14,13 @@ include($ENV{PW_ROOT}/pw_build/pigweed.cmake) -if(Zephyr_FOUND AND CONFIG_PIGWEED_CHRONO_SYSTEM_CLOCK) +if(CONFIG_PIGWEED_CHRONO_SYSTEM_CLOCK) pw_add_module_library(pw_chrono_zephyr.system_clock IMPLEMENTS_FACADES pw_chrono.system_clock PUBLIC_DEPS pw_function ) - pw_set_backend(pw_chrono.system_clock pw_chrono_zephyr.system_clock) zephyr_link_interface(pw_chrono_zephyr.system_clock) zephyr_link_libraries(pw_chrono_zephyr.system_clock) endif()
\ No newline at end of file diff --git a/pw_chrono_zephyr/Kconfig b/pw_chrono_zephyr/Kconfig index c6eacaca5..4996cb02b 100644 --- a/pw_chrono_zephyr/Kconfig +++ b/pw_chrono_zephyr/Kconfig @@ -12,14 +12,7 @@ # License for the specific language governing permissions and limitations under # the License. -menuconfig PIGWEED_CHRONO - bool "Enable the Pigweed chrono facade (pw_chrono)" - select PIGWEED_PREPROCESSOR - -if PIGWEED_CHRONO - config PIGWEED_CHRONO_SYSTEM_CLOCK bool "Enabled the Pigweed chrono system clock library (pw_chrono.system_clock)" + select PIGWEED_PREPROCESSOR select PIGWEED_FUNCTION - -endif # PIGWEED_CHRONO |