From 15aa6ef5abd6d834a83ccbe1ca76acf0b7fbeb27 Mon Sep 17 00:00:00 2001 From: Piotr Mienkowski Date: Mon, 8 Apr 2019 22:48:15 +0200 Subject: [PATCH] zephyr: remove BOOT_HAVE_LOGGING Kconfig option This commit removes the non-standard BOOT_HAVE_LOGGING Kconfig option. Instead the standard LOG / MCUBOOT_LOG_LEVEL can be used to control logging. Signed-off-by: Piotr Mienkowski --- boot/zephyr/Kconfig | 15 +-------------- boot/zephyr/prj.conf | 2 ++ 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/boot/zephyr/Kconfig b/boot/zephyr/Kconfig index 13f5fc48..4fdd48f0 100644 --- a/boot/zephyr/Kconfig +++ b/boot/zephyr/Kconfig @@ -170,22 +170,9 @@ config ZEPHYR_TRY_MASS_ERASE This is not available for all targets. -config BOOT_HAVE_LOGGING - bool "MCUboot have logging enabled" - default y - select LOG - select LOG_IMMEDIATE - help - If y, enables logging on the serial port. The log level can - be defined by setting `CONFIG_MCUBOOT_LOG_LEVEL_*`. - If unsure, leave at the default value. - -if BOOT_HAVE_LOGGING module = MCUBOOT -module-dep = LOG -module-str = Log level for MCUBOOT application +module-str = MCUBoot bootloader source "subsys/logging/Kconfig.template.log_config" -endif menuconfig MCUBOOT_SERIAL bool "MCUboot serial recovery" diff --git a/boot/zephyr/prj.conf b/boot/zephyr/prj.conf index e4d851c7..23c462bf 100644 --- a/boot/zephyr/prj.conf +++ b/boot/zephyr/prj.conf @@ -39,5 +39,7 @@ CONFIG_MULTITHREADING=n # CONFIG_BT_CTLR is not set # CONFIG_I2C is not set +CONFIG_LOG=y +CONFIG_LOG_IMMEDIATE=y ### Ensure Zephyr logging changes don't use more resources CONFIG_LOG_DEFAULT_LEVEL=0