diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc index 854b322a53b8eed3c7a48db9c57c5a76b74ef8d3..f95e1a554efa50dfe772a276da31e0e6a67ce29c 100644 --- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc +++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc @@ -54,7 +54,7 @@ SRC_URI = "\ git://github.com/zephyrproject-rtos/tflite-micro.git;protocol=https;nobranch=1;destsuffix=git/modules/lib/tflite-micro;name=tflite-micro \ file://0001-cmake-add-yocto-toolchain.patch \ file://0001-x86-fix-efi-binary-generation-issue-in-cross-compila.patch \ - ${@bb.utils.contains("ONIRO_NO_ACM0", "1", "", "file://0001-console-enable-the-USB-ACM0-console-by-default.patch", d)} \ + ${@bb.utils.contains("ONIRO_ENABLE_ACM0", "1", "file://0001-console-enable-the-USB-ACM0-console-by-default.patch", "", d)} \ " S = "${WORKDIR}/git" diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-test.inc b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-test.inc index 77f45a7374075de69c7fc2183a58cdd8a0138617..6526bd23de6a9ac549636d9da8a400fe61bbf10b 100644 --- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-test.inc +++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-test.inc @@ -5,6 +5,9 @@ ZEPHYRTESTS:remove = "fifo fpu_sharing lifo mbox mem_heap mem_pool \ # Exclude tests which does not build for various reasons ZEPHYRTESTS:remove = "gen_isr_table spinlock smp mp" +# enable serial console on boot +ONIRO_ENABLE_ACM0 ?= "1" + # Exclude tests that are not currently compiling ZEPHYRTESTS:remove:96b-avenger96 = "common device poll queue sleep" ZEPHYRTESTS:remove:96b-nitrogen = "common device poll queue sleep"