From 64b1374f7a8db4049b87235655dec9469edbd7ca Mon Sep 17 00:00:00 2001 From: Nicolas VINCENT Date: Wed, 28 Jun 2023 11:48:49 +0200 Subject: [PATCH 1/3] kconfig: remove max-align config The max alignement for flash write is now fetched from device tree, there is no need for that kconfig entry anymore. Fixes 1fb66a19b3981effdb504076831250286d7d7ddc Signed-off-by: Nicolas VINCENT --- boot/zephyr/Kconfig | 6 ------ boot/zephyr/include/mcuboot_config/mcuboot_config.h | 6 ------ 2 files changed, 12 deletions(-) diff --git a/boot/zephyr/Kconfig b/boot/zephyr/Kconfig index 06bc61a35..f5528b028 100644 --- a/boot/zephyr/Kconfig +++ b/boot/zephyr/Kconfig @@ -65,12 +65,6 @@ config SINGLE_APPLICATION_SLOT uploading a new application overwrites the one that previously occupied the area. -config BOOT_MAX_ALIGN - int "Flash write alignement in bytes" - default 8 - help - Bytes alignment when performing writes into flash memory. - config BOOT_SOC_STM32H7XX bool "Use booloader for STM32H7xx SOC" default n diff --git a/boot/zephyr/include/mcuboot_config/mcuboot_config.h b/boot/zephyr/include/mcuboot_config/mcuboot_config.h index 150ee30ea..f7587b337 100644 --- a/boot/zephyr/include/mcuboot_config/mcuboot_config.h +++ b/boot/zephyr/include/mcuboot_config/mcuboot_config.h @@ -103,12 +103,6 @@ #endif /* CONFIG_SINGLE_APPLICATION_SLOT */ -#ifdef CONFIG_BOOT_MAX_ALIGN -#define MCUBOOT_BOOT_MAX_ALIGN CONFIG_BOOT_MAX_ALIGN -#elif defined(CONFIG_MCUBOOT_BOOT_MAX_ALIGN) -#define MCUBOOT_BOOT_MAX_ALIGN CONFIG_MCUBOOT_BOOT_MAX_ALIGN -#endif - #ifdef CONFIG_LOG #define MCUBOOT_HAVE_LOGGING 1 #endif From 8ff5ba6201667b1d1a875e992deb7bb0927e8ace Mon Sep 17 00:00:00 2001 From: Samuel MARTIN Date: Fri, 12 Jan 2024 14:27:30 +0100 Subject: [PATCH 2/3] direct-xip : Do not compile boot_version_cmp when MCUBOOT_DIRECT_XIP_DOWNGRADE_ALLOWED is set Avoid compilation warning about unused function. Signed-off-by: Samuel MARTIN --- boot/bootutil/src/loader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/boot/bootutil/src/loader.c b/boot/bootutil/src/loader.c index d1043f7ef..65e3974c1 100644 --- a/boot/bootutil/src/loader.c +++ b/boot/bootutil/src/loader.c @@ -613,6 +613,7 @@ boot_check_header_erased(struct boot_loader_state *state, int slot) return 0; } +#if !defined(MCUBOOT_DIRECT_XIP_DOWNGRADE_ALLOWED) #if (BOOT_IMAGE_NUMBER > 1) || \ defined(MCUBOOT_DIRECT_XIP) || \ defined(MCUBOOT_RAM_LOAD) || \ @@ -656,6 +657,7 @@ boot_version_cmp(const struct image_version *ver1, return 0; } #endif +#endif #if defined(MCUBOOT_DIRECT_XIP) /** From 09353aba3a6733bbecf638920ab74eb95c1db575 Mon Sep 17 00:00:00 2001 From: Samuel MARTIN Date: Fri, 12 Jan 2024 15:00:43 +0100 Subject: [PATCH 3/3] CI: github: Allow Mynewt run job failure Our CI environment does not support Mynewt targets. Signed-off-by: Samuel MARTIN --- .github/workflows/mynewt.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/mynewt.yaml b/.github/workflows/mynewt.yaml index b085e095d..973e3401c 100644 --- a/.github/workflows/mynewt.yaml +++ b/.github/workflows/mynewt.yaml @@ -32,5 +32,6 @@ jobs: run: | ./ci/mynewt_install.sh - name: Mynewt run + continue-on-error: true run: | ./ci/mynewt_run.sh