michaelh/zephyr
1
0
Fork 0
Code Releases Activity

mgmt: hawkbit: remove imply HWINFO

Browse source 
`imply` should only be used if the code can still operate without the
symbol, which is not the case. Move the ID source to a choice symbol,
which depends on `HWINFO` when required.

Signed-off-by: Jordan Yates <jordan@embeint.com>
This commit is contained in:
Jordan Yates 2025-02-22 20:52:15 +10:00 • committed by Fabio Baltieri
commit 2824a28871
2 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
subsys/mgmt/hawkbit/Kconfig
View file

@ -19,7 +19,6 @@ menuconfig HAWKBIT
select MPU_ALLOW_FLASH_WRITE select MPU_ALLOW_FLASH_WRITE
select IMG_ENABLE_IMAGE_CHECK select IMG_ENABLE_IMAGE_CHECK
select IMG_ERASE_PROGRESSIVELY select IMG_ERASE_PROGRESSIVELY
imply HWINFO if !HAWKBIT_CUSTOM_DEVICE_ID
help help
hawkBit is a domain independent back-end framework for polling out hawkBit is a domain independent back-end framework for polling out
software updates to constrained edge devices as well as more powerful software updates to constrained edge devices as well as more powerful
@ -113,12 +112,21 @@ config HAWKBIT_STATUS_BUFFER_SIZE
json strings, that are sent to the hawkBit server. It might json strings, that are sent to the hawkBit server. It might
be increased if the custom attributes are used extensively. be increased if the custom attributes are used extensively.
choice HAWKBIT_DEVICE_ID_SOURCE
prompt "Source of the Hawkbit device ID"
config HAWKBIT_HWINFO_DEVICE_ID
bool "Device ID through HWINFO module"
depends on HWINFO
config HAWKBIT_CUSTOM_DEVICE_ID config HAWKBIT_CUSTOM_DEVICE_ID
bool "Custom device id through callback function" bool "Custom device id through callback function"
help help
Be able to customize the device id during runtime to a custom value, Be able to customize the device id during runtime to a custom value,
by configuring the callback function. See `hawkbit_set_device_identity_cb` by configuring the callback function. See `hawkbit_set_device_identity_cb`
endchoice
config HAWKBIT_DEVICE_ID_MAX_LENGTH config HAWKBIT_DEVICE_ID_MAX_LENGTH
int "Maximum length of the device id" int "Maximum length of the device id"
depends on HAWKBIT_CUSTOM_DEVICE_ID depends on HAWKBIT_CUSTOM_DEVICE_ID

6
subsys/mgmt/hawkbit/hawkbit_device.c
View file

@ -19,7 +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) static bool hawkbit_get_device_identity_default(char *id, int id_max_len)
{ {
#ifdef CONFIG_HWINFO #ifdef CONFIG_HAWKBIT_HWINFO_DEVICE_ID
uint8_t hwinfo_id[DEVICE_ID_BIN_MAX_SIZE]; uint8_t hwinfo_id[DEVICE_ID_BIN_MAX_SIZE];
ssize_t length; ssize_t length;
@ -32,12 +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); length = bin2hex(hwinfo_id, (size_t)length, id, id_max_len);
return length > 0; return length > 0;
#else /* CONFIG_HWINFO */ #else /* CONFIG_HAWKBIT_HWINFO_DEVICE_ID */
ARG_UNUSED(id); ARG_UNUSED(id);
ARG_UNUSED(id_max_len); ARG_UNUSED(id_max_len);
return false; return false;
#endif /* CONFIG_HWINFO */ #endif /* CONFIG_HAWKBIT_HWINFO_DEVICE_ID */
} }
#ifdef CONFIG_HAWKBIT_CUSTOM_DEVICE_ID #ifdef CONFIG_HAWKBIT_CUSTOM_DEVICE_ID