Fixed BOOT_LOAD_PIN. Fixed Makefile for Windows. Added filename customization.

Author: mattairtech

bootloaders/zero/Makefile

@@ -89,7 +89,7 @@ ifeq ($(OS),Windows_NT)
   else
     MODULE_PATH?=$(LOCALAPPDATA)/Arduino15/packages/$(CORE_VENDOR)
     MODULE_PATH_ARDUINO?=$(LOCALAPPDATA)/Arduino15/packages/arduino
-    RM=rm
+    RM=del
     SEP=\\
   endif
 else
@@ -110,8 +110,9 @@ else
   endif
 endif
 
+PATHSEP=$(strip $(SEP))
 ARM_GCC_PATH?=$(MODULE_PATH_ARDUINO)/tools/arm-none-eabi-gcc/4.8.3-2014q1/bin/arm-none-eabi-
-BUILD_PATH=build
+BUILD_DIR=build
 
 # -----------------------------------------------------------------------------
 # Tools
@@ -124,7 +125,7 @@ SIZE=$(ARM_GCC_PATH)size
 # Compiler options
 # eliminate PARANOIA define to save a tiny amount of code (~40B)
 CFLAGS_EXTRA=-D$(SDCARD) -D__$(MCU)__ -DBOARD_ID_$(BOARD_ID) -DPARANOIA
-CFLAGS=-mthumb -mcpu=cortex-m0plus -Wall -c -std=gnu99 -ffunction-sections -fdata-sections -nostdlib -nostartfiles --param max-inline-insns-single=500 -Wa,-adhlns=$(<:%.c=$(BUILD_PATH)/%.lst)
+CFLAGS=-mthumb -mcpu=cortex-m0plus -Wall -c -std=gnu99 -ffunction-sections -fdata-sections -nostdlib -nostartfiles --param max-inline-insns-single=500 -Wa,-adhlns=$(<:%.c=$(BUILD_DIR)/%.lst)
 ifdef DEBUG
   CFLAGS+=-g3 -O1 -DDEBUG=1
 else
@@ -177,8 +178,8 @@ SOURCES= \
   sam_ba_serial.c
 endif
 
-OBJECTS=$(addprefix $(BUILD_PATH)/, $(SOURCES:.c=.o))
-DEPS=$(addprefix $(BUILD_PATH)/, $(SOURCES:.c=.d))
+OBJECTS=$(addprefix $(BUILD_DIR)/, $(SOURCES:.c=.o))
+DEPS=$(addprefix $(BUILD_DIR)/, $(SOURCES:.c=.d))
 
 ifneq "test$(AVRSTUDIO_EXE_PATH)" "test"
   AS_BUILD=copy_for_atmel_studio
@@ -191,34 +192,34 @@ endif
 
 all: print_info $(SOURCES) $(BIN) $(HEX) $(AS_BUILD)
 
-$(ELF): Makefile $(BUILD_PATH) $(OBJECTS)
+$(ELF): Makefile $(BUILD_DIR) $(OBJECTS)
 	@echo ----------------------------------------------------------
 	@echo Creating ELF binary
-	"$(CC)" -L. -L$(BUILD_PATH) $(LDFLAGS) -Os -Wl,--gc-sections -save-temps -Tlinker_scripts/$(LINKER_SCRIPT) -Wl,-Map,"$(BUILD_PATH)/$(NAME).map" -o "$(BUILD_PATH)/$(ELF)" -Wl,--start-group $(OBJECTS) -lm -Wl,--end-group
-	"$(NM)" "$(BUILD_PATH)/$(ELF)" >"$(BUILD_PATH)/$(NAME)_symbols.txt"
-	"$(SIZE)" --format=sysv -t -x $(BUILD_PATH)/$(ELF)
+	"$(CC)" -L. -L$(BUILD_DIR) $(LDFLAGS) -Os -Wl,--gc-sections -save-temps -Tlinker_scripts/$(LINKER_SCRIPT) -Wl,-Map,"$(BUILD_DIR)/$(NAME).map" -o "$(BUILD_DIR)/$(ELF)" -Wl,--start-group $(OBJECTS) -lm -Wl,--end-group
+	"$(NM)" "$(BUILD_DIR)/$(ELF)" >"$(BUILD_DIR)/$(NAME)_symbols.txt"
+	"$(SIZE)" --format=sysv -t -x $(BUILD_DIR)/$(ELF)
 
 $(BIN): $(ELF)
 	@echo ----------------------------------------------------------
 	@echo Creating flash binary
-	"$(OBJCOPY)" -O binary $(BUILD_PATH)/$< $@
+	"$(OBJCOPY)" -O binary $(BUILD_DIR)/$< $@
 
 $(HEX): $(ELF)
 	@echo ----------------------------------------------------------
 	@echo Creating flash binary
-	"$(OBJCOPY)" -O ihex $(BUILD_PATH)/$< $@
+	"$(OBJCOPY)" -O ihex $(BUILD_DIR)/$< $@
 
-$(BUILD_PATH)/%.o: %.c
+$(BUILD_DIR)/%.o: %.c
 	@echo ----------------------------------------------------------
 	@echo Compiling $< to $@
 	"$(CC)" $(CFLAGS) $(CFLAGS_EXTRA) $(INCLUDES) $< -o $@
 	@echo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-$(BUILD_PATH):
+$(BUILD_DIR):
 	@echo ----------------------------------------------------------
 	@echo Creating build folder
-	-mkdir $(BUILD_PATH)
-	-mkdir $(BUILD_PATH)/SDCard
+	-mkdir $(BUILD_DIR)
+	-mkdir $(BUILD_DIR)$(PATHSEP)SDCard
 
 print_info:
 	@echo ----------------------------------------------------------
@@ -234,30 +235,30 @@ print_info:
 copy_for_atmel_studio: $(BIN) $(HEX)
 	@echo ----------------------------------------------------------
 	@echo Atmel Studio detected, copying ELF to project root for debug
-	cp $(BUILD_PATH)/$(ELF) .
+	cp $(BUILD_DIR)$(PATHSEP)$(ELF) .
 
 clean_for_atmel_studio:
 	@echo ----------------------------------------------------------
 	@echo Atmel Studio detected, cleaning ELF from project root
-	-$(RM) ./$(ELF)
+	-$(RM) .$(PATHSEP)$(ELF)
 
 clean: $(AS_CLEAN)
 	@echo ----------------------------------------------------------
 	@echo Cleaning project
 	-$(RM) $(BIN)
 	-$(RM) $(HEX)
-	-$(RM) $(BUILD_PATH)/SDCard/*.*
-	-$(RM) $(BUILD_PATH)/*.*
-	-rmdir $(BUILD_PATH)/SDCard
-	-rmdir $(BUILD_PATH)
+	-$(RM) $(BUILD_DIR)$(PATHSEP)SDCard$(PATHSEP)*.*
+	-$(RM) $(BUILD_DIR)$(PATHSEP)*.*
+	-rmdir $(BUILD_DIR)$(PATHSEP)SDCard
+	-rmdir $(BUILD_DIR)
 
 mostly_clean: $(AS_CLEAN)
 	@echo ----------------------------------------------------------
 	@echo Cleaning project except bin
 	-$(RM) $(HEX)
-	-$(RM) $(BUILD_PATH)/SDCard/*.*
-	-$(RM) $(BUILD_PATH)/*.*
-	-rmdir $(BUILD_PATH)/SDCard
-	-rmdir $(BUILD_PATH)
+	-$(RM) $(BUILD_DIR)$(PATHSEP)SDCard$(PATHSEP)*.*
+	-$(RM) $(BUILD_DIR)$(PATHSEP)*.*
+	-rmdir $(BUILD_DIR)$(PATHSEP)SDCard
+	-rmdir $(BUILD_DIR)
 
-.phony: print_info $(BUILD_PATH)
+.phony: print_info $(BUILD_DIR)

bootloaders/zero/README.md

@@ -240,7 +240,7 @@ This driver is the same as the one used by the MattairTech SAM M0+ Core.
 7. Click Tools->Burn Bootloader. Ignore any messages about not supporting shutdown or reset.
 8. Continue with driver installation above.
 
-A running sketch *may* interfere with the bootloader installation process. Be sure you are running the existing bootloader or using a blank chip.
+**A running sketch *may* interfere with the bootloader installation process. Be sure you are running the existing bootloader or using a blank chip.**
 
 #### Bootloader Installation Using Another Tool (ie: Atmel Studio, openocd)
 
@@ -479,6 +479,17 @@ binary file on the SD card already matches the installed firmware. In this
 case, the LED will blink with status code LED_STATUS_FILE_ALREADY_MATCHES.
 By default, SDCARD_AUTORUN_DISABLED is defined.
 
+### SDCARD_FILENAME_PRIMARY
+### SDCARD_FILENAME_SECONDARY
+
+Two different binary files can be loaded, depending on external pin settings.
+By default, the filenames are UPDATE.BIN and UPDATE2.BIN, but these can be
+overridden by defining SDCARD_FILENAME_PRIMARY and SDCARD_FILENAME_SECONDARY.
+If both pins are configured, SDCARD_FILENAME_PRIMARY (UPDATE.BIN) will be
+loaded when PIN1 is enabled, and SDCARD_FILENAME_PRIMARY (UPDATE2.BIN) is
+loaded when PIN2 is enabled. If only one pin or no pin is configured, only
+SDCARD_FILENAME_PRIMARY is loaded.
+
 ### SAM_BA_INTERFACE
 
 Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, SAM_BA_NONE, or
@@ -651,6 +662,10 @@ which will produce a binary named sam_ba_sdcard_Generic_x21J_SAMD21J18A.bin
 
 ## Technical Details
 
+**TTL Serial**
+
+The TX and RX pins are defined in the relevant board_definitions_* file. The baud rate is 115200 (8N1).
+
 **Arduino IDE Auto-Reset**
 
 When the Arduino IDE initiates the bootloader, the following procedure is used:
@@ -700,6 +715,8 @@ of the system stack. The applet in this case is a very simple word copy function
 applet has its own stack at the top of RAM, but the word copy applet uses little/none of this.
 The bossac tool is responsible for loading the applet. See Devices.h from the Bossa source.
 
+**A running sketch *may* interfere with the bootloader installation process. Be sure you are running the existing bootloader or using a blank chip.**
+
 
 ## License
 

bootloaders/zero/SDCard/sdBootloader.c

@@ -22,8 +22,15 @@
 FATFS Fatfs;                    /* Petit-FatFs work area */
 BYTE Buff[FLASH_PAGE_SIZE];        /* Page data buffer */
 
-char updateBin[] = "UPDATE.BIN";
-char update2Bin[] = "UPDATE2.BIN";
+#ifndef SDCARD_FILENAME_PRIMARY
+#define SDCARD_FILENAME_PRIMARY "UPDATE.BIN"
+#endif
+#ifndef SDCARD_FILENAME_SECONDARY
+#define SDCARD_FILENAME_SECONDARY "UPDATE2.BIN"
+#endif
+
+char updateBin[] = SDCARD_FILENAME_PRIMARY;
+char update2Bin[] = SDCARD_FILENAME_SECONDARY;
 
 uint8_t sdBootloader (uint8_t mode)
 {

bootloaders/zero/board_definitions/board_definitions_Generic_D11C14A.h

@@ -38,7 +38,9 @@
  * makefile (so it can be used with the build_all_bootloaders.sh script).
  * Size: ~2788B. Disabled by default. Available with 4KB bootloader.
  */
+#ifndef SDCARD_ENABLED
 //#define SDCARD_ENABLED
+#endif
 
 /* If SDCARD_ENABLED is defined, then all SDCARD_SPI_* defines must also be set.
  * When setting SDCARD_SPI_PADx defines, consult the appropriate header file
@@ -96,6 +98,17 @@
  */
 #define SDCARD_AUTORUN_DISABLED
 
+/* Two different binary files can be loaded, depending on external pin settings.
+ * By default, the filenames are UPDATE.BIN and UPDATE2.BIN, but these can be
+ * overridden by defining SDCARD_FILENAME_PRIMARY and SDCARD_FILENAME_SECONDARY.
+ * If both pins are configured, SDCARD_FILENAME_PRIMARY (UPDATE.BIN) will be
+ * loaded when PIN1 is enabled, and SDCARD_FILENAME_PRIMARY (UPDATE2.BIN) is
+ * loaded when PIN2 is enabled. If only one pin or no pin is configured, only
+ * SDCARD_FILENAME_PRIMARY is loaded.
+ */
+//#define SDCARD_FILENAME_PRIMARY        "UPDATE.BIN"
+//#define SDCARD_FILENAME_SECONDARY      "UPDATE2.BIN"
+
 /* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, SAM_BA_NONE, or
  * SAM_BA_BOTH_INTERFACES. With 4KB bootloaders, select only one interface (except
  * when using SDCARD_ENABLED, then set SAM_BA_INTERFACE to SAM_BA_NONE). The C21

bootloaders/zero/board_definitions/board_definitions_Generic_D11D14AM.h

@@ -38,7 +38,9 @@
  * makefile (so it can be used with the build_all_bootloaders.sh script).
  * Size: ~2788B. Disabled by default. Available with 4KB bootloader.
  */
+#ifndef SDCARD_ENABLED
 //#define SDCARD_ENABLED
+#endif
 
 /* If SDCARD_ENABLED is defined, then all SDCARD_SPI_* defines must also be set.
  * When setting SDCARD_SPI_PADx defines, consult the appropriate header file
@@ -96,6 +98,17 @@
  */
 #define SDCARD_AUTORUN_DISABLED
 
+/* Two different binary files can be loaded, depending on external pin settings.
+ * By default, the filenames are UPDATE.BIN and UPDATE2.BIN, but these can be
+ * overridden by defining SDCARD_FILENAME_PRIMARY and SDCARD_FILENAME_SECONDARY.
+ * If both pins are configured, SDCARD_FILENAME_PRIMARY (UPDATE.BIN) will be
+ * loaded when PIN1 is enabled, and SDCARD_FILENAME_PRIMARY (UPDATE2.BIN) is
+ * loaded when PIN2 is enabled. If only one pin or no pin is configured, only
+ * SDCARD_FILENAME_PRIMARY is loaded.
+ */
+//#define SDCARD_FILENAME_PRIMARY        "UPDATE.BIN"
+//#define SDCARD_FILENAME_SECONDARY      "UPDATE2.BIN"
+
 /* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, SAM_BA_NONE, or
  * SAM_BA_BOTH_INTERFACES. With 4KB bootloaders, select only one interface (except
  * when using SDCARD_ENABLED, then set SAM_BA_INTERFACE to SAM_BA_NONE). The C21

bootloaders/zero/board_definitions/board_definitions_Generic_D11D14AS.h

@@ -38,7 +38,9 @@
  * makefile (so it can be used with the build_all_bootloaders.sh script).
  * Size: ~2788B. Disabled by default. Available with 4KB bootloader.
  */
+#ifndef SDCARD_ENABLED
 //#define SDCARD_ENABLED
+#endif
 
 /* If SDCARD_ENABLED is defined, then all SDCARD_SPI_* defines must also be set.
  * When setting SDCARD_SPI_PADx defines, consult the appropriate header file
@@ -96,6 +98,17 @@
  */
 #define SDCARD_AUTORUN_DISABLED
 
+/* Two different binary files can be loaded, depending on external pin settings.
+ * By default, the filenames are UPDATE.BIN and UPDATE2.BIN, but these can be
+ * overridden by defining SDCARD_FILENAME_PRIMARY and SDCARD_FILENAME_SECONDARY.
+ * If both pins are configured, SDCARD_FILENAME_PRIMARY (UPDATE.BIN) will be
+ * loaded when PIN1 is enabled, and SDCARD_FILENAME_PRIMARY (UPDATE2.BIN) is
+ * loaded when PIN2 is enabled. If only one pin or no pin is configured, only
+ * SDCARD_FILENAME_PRIMARY is loaded.
+ */
+//#define SDCARD_FILENAME_PRIMARY        "UPDATE.BIN"
+//#define SDCARD_FILENAME_SECONDARY      "UPDATE2.BIN"
+
 /* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, SAM_BA_NONE, or
  * SAM_BA_BOTH_INTERFACES. With 4KB bootloaders, select only one interface (except
  * when using SDCARD_ENABLED, then set SAM_BA_INTERFACE to SAM_BA_NONE). The C21

bootloaders/zero/board_definitions/board_definitions_Generic_x21E.h

@@ -38,7 +38,9 @@
  * makefile (so it can be used with the build_all_bootloaders.sh script).
  * Size: ~2788B. Disabled by default. Available with 4KB bootloader.
  */
+#ifndef SDCARD_ENABLED
 //#define SDCARD_ENABLED
+#endif
 
 /* If SDCARD_ENABLED is defined, then all SDCARD_SPI_* defines must also be set.
  * When setting SDCARD_SPI_PADx defines, consult the appropriate header file
@@ -96,6 +98,17 @@
  */
 #define SDCARD_AUTORUN_DISABLED
 
+/* Two different binary files can be loaded, depending on external pin settings.
+ * By default, the filenames are UPDATE.BIN and UPDATE2.BIN, but these can be
+ * overridden by defining SDCARD_FILENAME_PRIMARY and SDCARD_FILENAME_SECONDARY.
+ * If both pins are configured, SDCARD_FILENAME_PRIMARY (UPDATE.BIN) will be
+ * loaded when PIN1 is enabled, and SDCARD_FILENAME_PRIMARY (UPDATE2.BIN) is
+ * loaded when PIN2 is enabled. If only one pin or no pin is configured, only
+ * SDCARD_FILENAME_PRIMARY is loaded.
+ */
+//#define SDCARD_FILENAME_PRIMARY        "UPDATE.BIN"
+//#define SDCARD_FILENAME_SECONDARY      "UPDATE2.BIN"
+
 /* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, SAM_BA_NONE, or
  * SAM_BA_BOTH_INTERFACES. With 4KB bootloaders, select only one interface (except
  * when using SDCARD_ENABLED, then set SAM_BA_INTERFACE to SAM_BA_NONE). The C21

bootloaders/zero/board_definitions/board_definitions_Generic_x21G.h

@@ -38,7 +38,9 @@
  * makefile (so it can be used with the build_all_bootloaders.sh script).
  * Size: ~2788B. Disabled by default. Available with 4KB bootloader.
  */
+#ifndef SDCARD_ENABLED
 //#define SDCARD_ENABLED
+#endif
 
 /* If SDCARD_ENABLED is defined, then all SDCARD_SPI_* defines must also be set.
  * When setting SDCARD_SPI_PADx defines, consult the appropriate header file
@@ -96,6 +98,17 @@
  */
 #define SDCARD_AUTORUN_DISABLED
 
+/* Two different binary files can be loaded, depending on external pin settings.
+ * By default, the filenames are UPDATE.BIN and UPDATE2.BIN, but these can be
+ * overridden by defining SDCARD_FILENAME_PRIMARY and SDCARD_FILENAME_SECONDARY.
+ * If both pins are configured, SDCARD_FILENAME_PRIMARY (UPDATE.BIN) will be
+ * loaded when PIN1 is enabled, and SDCARD_FILENAME_PRIMARY (UPDATE2.BIN) is
+ * loaded when PIN2 is enabled. If only one pin or no pin is configured, only
+ * SDCARD_FILENAME_PRIMARY is loaded.
+ */
+//#define SDCARD_FILENAME_PRIMARY        "UPDATE.BIN"
+//#define SDCARD_FILENAME_SECONDARY      "UPDATE2.BIN"
+
 /* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, SAM_BA_NONE, or
  * SAM_BA_BOTH_INTERFACES. With 4KB bootloaders, select only one interface (except
  * when using SDCARD_ENABLED, then set SAM_BA_INTERFACE to SAM_BA_NONE). The C21

bootloaders/zero/board_definitions/board_definitions_Generic_x21J.h

@@ -38,7 +38,9 @@
  * makefile (so it can be used with the build_all_bootloaders.sh script).
  * Size: ~2788B. Disabled by default. Available with 4KB bootloader.
  */
+#ifndef SDCARD_ENABLED
 //#define SDCARD_ENABLED
+#endif
 
 /* If SDCARD_ENABLED is defined, then all SDCARD_SPI_* defines must also be set.
  * When setting SDCARD_SPI_PADx defines, consult the appropriate header file
@@ -96,6 +98,17 @@
  */
 #define SDCARD_AUTORUN_DISABLED
 
+/* Two different binary files can be loaded, depending on external pin settings.
+ * By default, the filenames are UPDATE.BIN and UPDATE2.BIN, but these can be
+ * overridden by defining SDCARD_FILENAME_PRIMARY and SDCARD_FILENAME_SECONDARY.
+ * If both pins are configured, SDCARD_FILENAME_PRIMARY (UPDATE.BIN) will be
+ * loaded when PIN1 is enabled, and SDCARD_FILENAME_PRIMARY (UPDATE2.BIN) is
+ * loaded when PIN2 is enabled. If only one pin or no pin is configured, only
+ * SDCARD_FILENAME_PRIMARY is loaded.
+ */
+//#define SDCARD_FILENAME_PRIMARY        "UPDATE.BIN"
+//#define SDCARD_FILENAME_SECONDARY      "UPDATE2.BIN"
+
 /* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, SAM_BA_NONE, or
  * SAM_BA_BOTH_INTERFACES. With 4KB bootloaders, select only one interface (except
  * when using SDCARD_ENABLED, then set SAM_BA_INTERFACE to SAM_BA_NONE). The C21

bootloaders/zero/board_definitions/board_definitions_MT_D11.h

@@ -38,7 +38,9 @@
  * makefile (so it can be used with the build_all_bootloaders.sh script).
  * Size: ~2788B. Disabled by default. Available with 4KB bootloader.
  */
+#ifndef SDCARD_ENABLED
 //#define SDCARD_ENABLED
+#endif
 
 /* If SDCARD_ENABLED is defined, then all SDCARD_SPI_* defines must also be set.
  * When setting SDCARD_SPI_PADx defines, consult the appropriate header file
@@ -96,6 +98,17 @@
  */
 #define SDCARD_AUTORUN_DISABLED
 
+/* Two different binary files can be loaded, depending on external pin settings.
+ * By default, the filenames are UPDATE.BIN and UPDATE2.BIN, but these can be
+ * overridden by defining SDCARD_FILENAME_PRIMARY and SDCARD_FILENAME_SECONDARY.
+ * If both pins are configured, SDCARD_FILENAME_PRIMARY (UPDATE.BIN) will be
+ * loaded when PIN1 is enabled, and SDCARD_FILENAME_PRIMARY (UPDATE2.BIN) is
+ * loaded when PIN2 is enabled. If only one pin or no pin is configured, only
+ * SDCARD_FILENAME_PRIMARY is loaded.
+ */
+//#define SDCARD_FILENAME_PRIMARY        "UPDATE.BIN"
+//#define SDCARD_FILENAME_SECONDARY      "UPDATE2.BIN"
+
 /* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, SAM_BA_NONE, or
  * SAM_BA_BOTH_INTERFACES. With 4KB bootloaders, select only one interface (except
  * when using SDCARD_ENABLED, then set SAM_BA_INTERFACE to SAM_BA_NONE). The C21