diff options
| author | Wealian Liao <whliao@nuvoton.corp-partner.google.com> | 2021-05-06 18:38:02 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-05-12 03:19:42 +0000 |
| commit | 44783883e2e310fcefbc373771241bae98da80f6 (patch) | |
| tree | 0e0967054e03a775b706841f9f8b822f199255db | |
| parent | 790b46ba9c7056c47cf1228afe22710c83d0b5cc (diff) | |
| download | chrome-ec-44783883e2e310fcefbc373771241bae98da80f6.tar.gz | |
zephyr: ztest: Add system_preinitialize back to ztest
Per CL:2731180, system_preinitialize() should be added in ztest. Add
the dependency functions to ztest_system & add system_preinitialize
back to ztest.
BUG=b:183611735
BRANCH=none
TEST=zmake testall
Signed-off-by: Wealian Liao <whliao@nuvoton.corp-partner.google.com>
Change-Id: Iea90e1909d28556421471d7e905d0e56705b3fc0
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2878761
Reviewed-by: Jeremy Bettis <jbettis@chromium.org>
| -rw-r--r-- | zephyr/shim/src/system.c | 5 | ||||
| -rw-r--r-- | zephyr/shim/src/ztest_system.c | 13 |
2 files changed, 15 insertions, 3 deletions
diff --git a/zephyr/shim/src/system.c b/zephyr/shim/src/system.c index 4984759602..5a725477ab 100644 --- a/zephyr/shim/src/system.c +++ b/zephyr/shim/src/system.c @@ -23,7 +23,7 @@ LOG_MODULE_REGISTER(shim_system, LOG_LEVEL_ERR); STATIC_IF_NOT(CONFIG_ZTEST) const struct device *bbram_dev; -STATIC_IF_NOT(CONFIG_ZTEST) const struct device *sys_dev; +static const struct device *sys_dev; #if DT_NODE_EXISTS(DT_NODELABEL(bbram)) static int system_init(const struct device *unused) @@ -312,7 +312,6 @@ static int system_preinitialize(const struct device *unused) return 0; } -#if (!defined(CONFIG_ZTEST)) + SYS_INIT(system_preinitialize, PRE_KERNEL_1, CONFIG_PLATFORM_EC_SYSTEM_PRE_INIT_PRIORITY); -#endif diff --git a/zephyr/shim/src/ztest_system.c b/zephyr/shim/src/ztest_system.c index 5fbc3dc50d..6aa1cf2efb 100644 --- a/zephyr/shim/src/ztest_system.c +++ b/zephyr/shim/src/ztest_system.c @@ -52,3 +52,16 @@ void system_print_banner(void) { printk("Image: %s\n", build_info); } + +uint32_t chip_read_reset_flags(void) +{ + return 0; +} + +void chip_save_reset_flags(uint32_t flags) +{ +} + +void system_set_reset_flags(uint32_t flags) +{ +} |