Merge pull request #2 from smartin-vossloh/sma/cleanup-warning

Cleanup warning
SiemaApplications-attic · Jan 16, 2024 · 82c5721 · 82c5721
2 parents 5945a3a + 09353ab
commit 82c5721
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 12 deletions.
diff --git 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
diff --git 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)
 /**

diff --git 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
@@ -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