Skip to content

Commit 3175182

Browse files
martinjaegernvlsianpu
authored andcommitted
boot: zephyr: main: fix log_process call after Zephyr change
The legacy logging subsystem was removed in below commit: zephyrproject-rtos/zephyr@c5f2cde This commit maintains compatibility with Zephyr upstream before and after the change by using the now removed CONFIG_LOG1 and CONFIG_LOG2 defines. Signed-off-by: Martin Jäger <[email protected]>
1 parent 477ed81 commit 3175182

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

boot/zephyr/main.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,12 @@ void boot_log_thread_func(void *dummy1, void *dummy2, void *dummy3)
327327
log_init();
328328

329329
while (1) {
330+
#if defined(CONFIG_LOG1) || defined(CONFIG_LOG2)
331+
/* support Zephyr legacy logging implementation before commit c5f2cde */
330332
if (log_process(false) == false) {
333+
#else
334+
if (log_process() == false) {
335+
#endif
331336
if (boot_log_stop) {
332337
break;
333338
}

0 commit comments

Comments
 (0)