zephyr-kernel-src.inc: Reverse logic of applying ACM0 patch

Patch should be applied only in CI environment with "ONIRO_ENABLE_ACM0"
flag set to not break UX

Fixes: eclipse/oniro-core/meta-zephyr#30



Signed-off-by: Pavel Zhukov <pavel.zhukov@huawei.com>

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"
 

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"