commit 420ad9adbd644fd43516d0e59080a84935aa72de
author Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no> Thu Jul 29 16:22:52 2021 +0200
committer Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no> Fri Jul 30 12:26:43 2021 +0200
tree bcaafd68d830c8ebcbfc876b4ae345ee1063fa22
parent 1b62cf2c10579237775fd0d9042c49be43c02f7c

zephyr/boot_serial_extension: kconfig of custom command for get images status

made he command implementation selectable.

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>

boot/zephyr/Kconfig

diff --git a/boot/zephyr/Kconfig b/boot/zephyr/Kconfig
index 99b5a5c..b7c707c 100644
--- a/boot/zephyr/Kconfig
+++ b/boot/zephyr/Kconfig
@@ -567,7 +567,7 @@
 	 on some hardware that has long erase times, to prevent long wait
 	 times at the beginning of the DFU process.
 
-config ENABLE_MGMT_PERUSER
+menuconfig ENABLE_MGMT_PERUSER
 	bool "Enable system specific mcumgr commands"
 	depends on BOOT_SERIAL_UART
 	help
@@ -577,6 +577,14 @@
 	  These are system specific command and system specific implementation
 	  function is required to process these commands.
 
+if ENABLE_MGMT_PERUSER
+config BOOT_MGMT_CUSTOM_IMG_LIST
+	bool "Enable custom image list command"
+	help
+	  The option enables command which returns versions and installation
+	  statuses (custom property) for all images.
+
+endif # ENABLE_MGMT_PERUSER
 endif # MCUBOOT_SERIAL
 
 config BOOT_INTR_VEC_RELOC

boot/zephyr/boot_serial_extensions.c

diff --git a/boot/zephyr/boot_serial_extensions.c b/boot/zephyr/boot_serial_extensions.c
index 88f84ad..3cd801c 100644
--- a/boot/zephyr/boot_serial_extensions.c
+++ b/boot/zephyr/boot_serial_extensions.c
@@ -50,6 +50,7 @@
     return rc;
 }
 
+#ifdef MCUBOOT_MGMT_CUSTOM_IMG_LIST
 static int custom_img_status(int image_index, uint32_t slot,char *buffer,
                         ssize_t len)
 {
@@ -117,6 +118,8 @@
 #ifndef ZEPHYR_MGMT_GRP_BASIC_CMD_IMAGE_LIST
     #define ZEPHYR_MGMT_GRP_BASIC_CMD_IMAGE_LIST 1
 #endif
+#endif /*MCUBOOT_MGMT_CUSTOM_IMG_LIST*/
+
 int bs_peruser_system_specific(const struct nmgr_hdr *hdr, const char *buffer,
                                int len, cbor_state_t *cs)
 {
@@ -128,9 +131,11 @@
                 mgmt_rc = bs_custom_storage_erase(cs);
             }
         } else if (hdr->nh_op == NMGR_OP_READ) {
+#ifdef MCUBOOT_MGMT_CUSTOM_IMG_LIST
             if (hdr->nh_id == ZEPHYR_MGMT_GRP_BASIC_CMD_IMAGE_LIST) {
                 mgmt_rc = bs_custom_img_list(cs);
             }
+#endif
         }
     }
 

boot/zephyr/include/mcuboot_config/mcuboot_config.h

diff --git a/boot/zephyr/include/mcuboot_config/mcuboot_config.h b/boot/zephyr/include/mcuboot_config/mcuboot_config.h
index 0de6974..ed62d98 100644
--- a/boot/zephyr/include/mcuboot_config/mcuboot_config.h
+++ b/boot/zephyr/include/mcuboot_config/mcuboot_config.h
@@ -151,6 +151,10 @@
 #define MCUBOOT_PERUSER_MGMT_GROUP_ENABLED 0
 #endif
 
+#ifdef CONFIG_BOOT_MGMT_CUSTOM_IMG_LIST
+#define MCUBOOT_MGMT_CUSTOM_IMG_LIST
+#endif
+
 /*
  * The configuration option enables direct image upload with the
  * serial recovery.