From fc8b20e4e91f0b460f2ab064f37b200a73afc511 Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Fri, 10 Mar 2023 01:39:08 +0100 Subject: [PATCH 1/3] examples/suit_update: improve default module selection --- examples/suit_update/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/examples/suit_update/Makefile b/examples/suit_update/Makefile index b00db43999..0a5712222f 100644 --- a/examples/suit_update/Makefile +++ b/examples/suit_update/Makefile @@ -13,12 +13,9 @@ RIOTBASE ?= $(CURDIR)/../.. # Include packages that pull up and auto-init the link layer. # NOTE: 6LoWPAN will be included if IEEE802.15.4 devices are present -# uncomment this to compile in support for a possibly available radio -#USEMODULE += netdev_default - USEMODULE += auto_init_gnrc_netif # Specify the mandatory networking modules for IPv6 and UDP -USEMODULE += gnrc_ipv6_router_default +USEMODULE += gnrc_ipv6_default USEMODULE += sock_udp # Additional networking modules that can be dropped if not needed USEMODULE += gnrc_icmpv6_echo @@ -87,6 +84,8 @@ ifeq (1,$(USE_ETHOS)) IFACE ?= riot0 TERMPROG = $(RIOTTOOLS)/ethos/ethos TERMFLAGS = $(IFACE) $(PORT) +else + USEMODULE += netdev_default endif # Ensure both slot bin files are always generated and linked to avoid compiling From cc1d48aaf1df813ec05812ae2a56ab65c86e100d Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Fri, 10 Mar 2023 01:48:00 +0100 Subject: [PATCH 2/3] examples/suit_update: add missing include --- examples/suit_update/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/suit_update/main.c b/examples/suit_update/main.c index 847d3e4022..47333c4194 100644 --- a/examples/suit_update/main.c +++ b/examples/suit_update/main.c @@ -40,6 +40,7 @@ #endif #ifdef MODULE_PERIPH_GPIO +#include "board.h" #include "periph/gpio.h" #endif From d16d8f362abe9cc709b67bb556810e1bbb618256 Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Fri, 10 Mar 2023 02:27:43 +0100 Subject: [PATCH 3/3] sys/suit: drop superfluous ')' in output --- sys/suit/handlers_global.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/suit/handlers_global.c b/sys/suit/handlers_global.c index 2e906e67e7..9a73809096 100644 --- a/sys/suit/handlers_global.c +++ b/sys/suit/handlers_global.c @@ -44,7 +44,7 @@ static int _version_handler(suit_manifest_t *manifest, int key, if (nanocbor_get_int32(it, &version) >= 0) { if (version == SUIT_VERSION) { manifest->validated |= SUIT_VALIDATED_VERSION; - LOG_INFO("suit: validated manifest version\n)"); + LOG_INFO("suit: validated manifest version\n"); return SUIT_OK; } } @@ -71,11 +71,11 @@ static int _seq_no_handler(suit_manifest_t *manifest, int key, seq_nr, stored_seq_no); if (seq_nr <= stored_seq_no) { - LOG_ERROR("seq_nr <= running image\n)"); + LOG_ERROR("seq_nr <= running image\n"); return SUIT_ERR_SEQUENCE_NUMBER; } - LOG_INFO("suit: validated sequence number\n)"); + LOG_INFO("suit: validated sequence number\n"); manifest->seq_number = seq_nr; manifest->validated |= SUIT_VALIDATED_SEQ_NR; return SUIT_OK;