Commit 3175182f authored Jul 21, 2022 by Martin Jäger Committed by Andrzej Puzdrowski Jul 27, 2022

boot: zephyr: main: fix log_process call after Zephyr change

The legacy logging subsystem was removed in below commit:
https://github.com/zephyrproject-rtos/zephyr/commit/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 <martin@libre.solar>

parent 477ed816

boot/zephyr/main.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -327,7 +327,12 @@ void boot_log_thread_func(void dummy1, void dummy2, void *dummy3)
		log_init();

		while (1) {
		#if defined(CONFIG_LOG1) \|\| defined(CONFIG_LOG2)
		/* support Zephyr legacy logging implementation before commit c5f2cde */
		if (log_process(false) == false) {
		#else
		if (log_process() == false) {
		#endif
		if (boot_log_stop) {
		break;
		}

Admin message