Fix space

mbed-ce · Dec 11, 2024 · 9b6c7e7 · 9b6c7e7
1 parent 38be332
commit 9b6c7e7
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 19 deletions.
diff --git a/storage/blockdevice/include/blockdevice/BufferedBlockDevice.h b/storage/blockdevice/include/blockdevice/BufferedBlockDevice.h
@@ -33,7 +33,7 @@ namespace mbed {
  * NAND flash.
  *
  * @note While the read and write size of the buffered block device will always be 1,
- *     the erase size is the same as the underlying block device.  In other words, you
+ *     the erase size is the same as the underlying block device. In other words, you
  *     still must erase in the hardware erase sector size.
  */
 class BufferedBlockDevice : public BlockDevice {

diff --git a/tools/cmake/UploadMethodManager.cmake b/tools/cmake/UploadMethodManager.cmake
@@ -146,4 +146,7 @@ function(mbed_generate_upload_target target)
 	else()
 		gen_upload_target(${target} ${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_FILE_BASE_NAME:${target}>.hex)
 	endif()
+
+	# Make sure building the upload target causes the target to be built first
+	add_dependencies(flash-${target} ${target})
 endfunction()
diff --git a/tools/cmake/upload_methods/UploadMethodARDUINO_BOSSAC.cmake b/tools/cmake/upload_methods/UploadMethodARDUINO_BOSSAC.cmake
@@ -28,6 +28,4 @@ function(gen_upload_target TARGET_NAME BINARY_FILE)
 		--write ${BINARY_FILE}
 		--reset)
 
-	add_dependencies(flash-${TARGET_NAME} ${TARGET_NAME})
-
 endfunction(gen_upload_target)
diff --git a/tools/cmake/upload_methods/UploadMethodJLINK.cmake b/tools/cmake/upload_methods/UploadMethodJLINK.cmake
@@ -71,9 +71,6 @@ exit
 		-ExitOnError
 		-CommandFile ${COMMAND_FILE_PATH})
 
-
-	add_dependencies(flash-${TARGET_NAME} ${TARGET_NAME})
-
 endfunction(gen_upload_target)
 
 ### Commands to run the debug server.

diff --git a/tools/cmake/upload_methods/UploadMethodLINKSERVER.cmake b/tools/cmake/upload_methods/UploadMethodLINKSERVER.cmake
@@ -37,8 +37,6 @@ function(gen_upload_target TARGET_NAME BINARY_FILE)
 			--addr ${MBED_UPLOAD_BASE_ADDR}
 			${BINARY_FILE})
 
-	add_dependencies(flash-${TARGET_NAME} ${TARGET_NAME})
-
 endfunction(gen_upload_target)
 
 ### Commands to run the debug server.

diff --git a/tools/cmake/upload_methods/UploadMethodMBED.cmake b/tools/cmake/upload_methods/UploadMethodMBED.cmake
@@ -25,6 +25,4 @@ function(gen_upload_target TARGET_NAME BINARY_FILE)
 			${mbed-os_SOURCE_DIR}/tools/python
 		VERBATIM)
 
-	add_dependencies(flash-${TARGET_NAME} ${TARGET_NAME})
-
 endfunction(gen_upload_target)
diff --git a/tools/cmake/upload_methods/UploadMethodOPENOCD.cmake b/tools/cmake/upload_methods/UploadMethodOPENOCD.cmake
@@ -41,7 +41,6 @@ endif()
 
 function(gen_upload_target TARGET_NAME BINARY_FILE)
 
-	# unlike other upload methods, OpenOCD uses the elf file
 	add_custom_target(flash-${TARGET_NAME}
 		COMMENT "Flashing ${TARGET_NAME} with OpenOCD..."
 		COMMAND ${OpenOCD}
@@ -51,7 +50,6 @@ function(gen_upload_target TARGET_NAME BINARY_FILE)
 		-c "program ${BINARY_FILE} ${MBED_UPLOAD_BASE_ADDR} reset exit"
 		VERBATIM)
 
-	add_dependencies(flash-${TARGET_NAME} ${TARGET_NAME})
 endfunction(gen_upload_target)
 
 ### Commands to run the debug server.

diff --git a/tools/cmake/upload_methods/UploadMethodPICOTOOL.cmake b/tools/cmake/upload_methods/UploadMethodPICOTOOL.cmake
@@ -29,12 +29,16 @@ function(gen_upload_target TARGET_NAME BINARY_FILE)
 		list(APPEND PICOTOOL_TARGET_ARGS --address ${PICOTOOL_TARGET_ADDRESS})
 	endif()
 
+	if("${MBED_OUTPUT_EXT}" STREQUAL "hex")
+        message(FATAL_ERROR "Bin file output must be enabled to use picotool.  Set MBED_OUTPUT_EXT to empty string or to 'bin' in your top level CMakeLists.txt!")
+    endif()
+
 	add_custom_target(flash-${TARGET_NAME}
 		COMMAND ${Picotool}
 			load
+			--verify
 		    --execute
-			$<TARGET_FILE:${TARGET_NAME}>)
-
-	add_dependencies(flash-${TARGET_NAME} ${TARGET_NAME})
+			--offset ${MBED_UPLOAD_BASE_ADDR}
+			${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_FILE_BASE_NAME:${TARGET_NAME}>.bin)
 
 endfunction(gen_upload_target)
diff --git a/tools/cmake/upload_methods/UploadMethodPYOCD.cmake b/tools/cmake/upload_methods/UploadMethodPYOCD.cmake
@@ -34,7 +34,6 @@ function(gen_upload_target TARGET_NAME BINARY_FILE)
 		--base-address ${MBED_UPLOAD_BASE_ADDR}
 		${BINARY_FILE})
 
-	add_dependencies(flash-${TARGET_NAME} ${TARGET_NAME})
 endfunction(gen_upload_target)
 
 ### Commands to run the debug server.

diff --git a/tools/cmake/upload_methods/UploadMethodSTLINK.cmake b/tools/cmake/upload_methods/UploadMethodSTLINK.cmake
@@ -32,7 +32,6 @@ function(gen_upload_target TARGET_NAME BINARY_FILE)
 		${STLINK_ARGS}
 		write ${BINARY_FILE} ${MBED_UPLOAD_BASE_ADDR})
 
-	add_dependencies(flash-${TARGET_NAME} ${TARGET_NAME})
 endfunction(gen_upload_target)
 
 ### Commands to run the debug server.

diff --git a/tools/cmake/upload_methods/UploadMethodSTM32CUBE.cmake b/tools/cmake/upload_methods/UploadMethodSTM32CUBE.cmake
@@ -36,8 +36,6 @@ function(gen_upload_target TARGET_NAME BINARY_FILE)
 		-w ${BINARY_FILE} ${MBED_UPLOAD_BASE_ADDR}
 		-rst)
 
-	add_dependencies(flash-${TARGET_NAME} ${TARGET_NAME})
-
 endfunction(gen_upload_target)
 
 ### Commands to run the debug server.