merge #29 :: Add mcuboot module to west.yml

* wip mcuboot zephyr stuff
* remove mcuboot from zephyr managed modules
* Update SHA for mcuboot

Author: brudley

arch/Kconfig

@@ -178,22 +178,22 @@ config SRAM_BASE_ADDRESS
 	  /chosen/zephyr,sram in devicetree. The user should generally avoid
 	  changing it via menuconfig or in configuration files.
 
-if ARC || ARM || ARM64 || NIOS2 || X86
+if ARC || ARM || ARM64 || NIOS2  || RISCV || X86
 
 # Workaround for not being able to have commas in macro arguments
 DT_CHOSEN_Z_FLASH := zephyr,flash
 
 config FLASH_SIZE
 	int "Flash Size in kB"
-	default $(dt_chosen_reg_size_int,$(DT_CHOSEN_Z_FLASH),0,K) if (XIP && (ARM ||ARM64)) || !ARM
+	default $(dt_chosen_reg_size_int,$(DT_CHOSEN_Z_FLASH),0,K) if (XIP && (ARM ||ARM64 || RISCV)) || !ARM
 	help
 	  This option specifies the size of the flash in kB.  It is normally set by
 	  the board's defconfig file and the user should generally avoid modifying
 	  it via the menu configuration.
 
 config FLASH_BASE_ADDRESS
 	hex "Flash Base Address"
-	default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_FLASH)) if (XIP && (ARM || ARM64)) || !ARM
+	default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_FLASH)) if (XIP && (ARM || ARM64 || RISCV)) || !ARM
 	help
 	  This option specifies the base address of the flash on the board. It is
 	  normally set by the board's defconfig file and the user should generally

include/devicetree/zephyr.h

@@ -63,6 +63,7 @@
 #define DT_CHOSEN_ZEPHYR_FLASH_CONTROLLER_LABEL \
 	DT_LABEL(DT_CHOSEN(zephyr_flash_controller))
 #endif
+//DT_LABEL(DT_CHOSEN(scorpio_flash_controller))
 
 #if DT_NODE_HAS_PROP(DT_CHOSEN(zephyr_can_primary), label)
 #define DT_CHOSEN_ZEPHYR_CAN_PRIMARY_LABEL \

subsys/dfu/boot/CMakeLists.txt

@@ -5,4 +5,6 @@ zephyr_library()
 zephyr_library_sources(mcuboot.c)
 zephyr_library_sources_ifdef(CONFIG_MCUBOOT_SHELL mcuboot_shell.c)
 zephyr_library_link_libraries(MCUBOOT_BOOTUTIL)
+zephyr_include_directories(../../../../modules/mcuboot/boot/bootutil/include)
+zephyr_include_directories(../../../../modules/mcuboot/boot/zephyr/include)
 endif()

subsys/dfu/img_util/flash_img.c

@@ -29,8 +29,8 @@
 #endif
 #endif /* CONFIG_TRUSTED_EXECUTION_NONSECURE */
 
-#define FLASH_WRITE_BLOCK_SIZE \
-	DT_PROP(DT_CHOSEN(zephyr_flash), write_block_size)
+#define FLASH_WRITE_BLOCK_SIZE 512
+//	DT_PROP(DT_CHOSEN(zephyr_flash), write_block_size)
 
 BUILD_ASSERT((CONFIG_IMG_BLOCK_BUF_SIZE % FLASH_WRITE_BLOCK_SIZE == 0),
 	     "CONFIG_IMG_BLOCK_BUF_SIZE is not a multiple of "