From ef9cc18fcf21ebd99c0bbc987df4b35af7c9e115 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fin=20Maa=C3=9F?= Date: Tue, 19 Nov 2024 10:02:47 +0100 Subject: [PATCH] mgmt: hawkbit: don't require HWINFO MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit don't require HWINFO, when HAWKBIT_CUSTOM_DEVICE_ID. Signed-off-by: Fin Maaß --- subsys/mgmt/hawkbit/Kconfig | 2 +- subsys/mgmt/hawkbit/hawkbit_device.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/subsys/mgmt/hawkbit/Kconfig b/subsys/mgmt/hawkbit/Kconfig index 94aab3b8de6..9da8979e878 100644 --- a/subsys/mgmt/hawkbit/Kconfig +++ b/subsys/mgmt/hawkbit/Kconfig @@ -6,7 +6,6 @@ menuconfig HAWKBIT depends on SETTINGS depends on FLASH depends on REBOOT - depends on HWINFO depends on NET_TCP depends on NET_SOCKETS depends on IMG_MANAGER @@ -18,6 +17,7 @@ menuconfig HAWKBIT select MPU_ALLOW_FLASH_WRITE select IMG_ENABLE_IMAGE_CHECK select IMG_ERASE_PROGRESSIVELY + imply HWINFO if !HAWKBIT_CUSTOM_DEVICE_ID help hawkBit is a domain independent back-end framework for polling out software updates to constrained edge devices as well as more powerful diff --git a/subsys/mgmt/hawkbit/hawkbit_device.c b/subsys/mgmt/hawkbit/hawkbit_device.c index 10ee07fbcdf..2d39c845a3e 100644 --- a/subsys/mgmt/hawkbit/hawkbit_device.c +++ b/subsys/mgmt/hawkbit/hawkbit_device.c @@ -19,6 +19,7 @@ bool hawkbit_get_device_identity(char *id, int id_max_len) static bool hawkbit_get_device_identity_default(char *id, int id_max_len) { +#ifdef CONFIG_HWINFO uint8_t hwinfo_id[DEVICE_ID_BIN_MAX_SIZE]; ssize_t length; @@ -31,6 +32,12 @@ static bool hawkbit_get_device_identity_default(char *id, int id_max_len) length = bin2hex(hwinfo_id, (size_t)length, id, id_max_len); return length > 0; +#else /* CONFIG_HWINFO */ + ARG_UNUSED(id); + ARG_UNUSED(id_max_len); + + return false; +#endif /* CONFIG_HWINFO */ } #ifdef CONFIG_HAWKBIT_CUSTOM_DEVICE_ID