Test 1

generic-gcc-avr.cmake

@@ -112,7 +112,7 @@ set(AVR_UPLOADTOOL_BASE_OPTIONS -p ${AVR_MCU} -c ${AVR_PROGRAMMER})
 
 # use AVR_UPLOADTOOL_BAUDRATE as baudrate for upload tool (if defined)
 if (AVR_UPLOADTOOL_BAUDRATE)
-    set(AVR_UPLOADTOOL_BASE_OPTIONS ${AVR_UPLOADTOOL_BASE_OPTIONS} -b ${AVR_UPLOADTOOL_BAUDRATE})
+    set(AVR_UPLOADTOOL_BASE_OPTIONS ${AVR_UPLOADTOOL_BASE_OPTIONS} -B ${AVR_UPLOADTOOL_BAUDRATE})
 endif ()
 
 ##########################################################################
@@ -237,6 +237,9 @@ function(add_avr_executable EXECUTABLE_NAME)
             upload_${EXECUTABLE_NAME}
             ${AVR_UPLOADTOOL} ${AVR_UPLOADTOOL_BASE_OPTIONS} ${AVR_UPLOADTOOL_OPTIONS}
             -U flash:w:${hex_file}
+            -U lfuse:w:${AVR_L_FUSE}:m
+            -U hfuse:w:${AVR_H_FUSE}:m
+            -U lock:w:${AVR_LOCK_FUSE}:m
             -P ${AVR_UPLOADTOOL_PORT}
             DEPENDS ${hex_file}
             COMMENT "Uploading ${hex_file} to ${AVR_MCU} using ${AVR_PROGRAMMER}"