Bootloader for test rig

Author: kevinmehall

Makefile

@@ -1,4 +1,4 @@
-TARGETS = firmware boot test_rig
+TARGETS = firmware boot test_rig test_rig_boot
 BUILD = build
 
 all: $(TARGETS)

boot/boot.h

@@ -9,7 +9,14 @@
 
 #pragma once
 #include "class/dfu/dfu.h"
+
+#ifdef TEST_RIG_BOOTLOADER
+#include "test_rig/test_rig_board.h"
+#define PIN_BTN PIN_START_BUTTON
+#define PIN_LED DIGITAL_PINS[4]
+#else
 #include "common/board.h"
+#endif
 
 #define GCLK_SYSTEM 0
 #define DFU_INTF 0

boot/main.c

@@ -82,21 +82,25 @@ void led_task() {
 }
 
 void bootloader_main() {
+	#ifndef TEST_RIG_BOOTLOADER
 	if (PM->RCAUSE.reg & (PM_RCAUSE_POR | PM_RCAUSE_BOD12 | PM_RCAUSE_BOD33)) {
 		// On powerup, power off MT7620
 		pin_low(PIN_SOC_RST);
 		pin_out(PIN_SOC_RST);
 	}
+	#endif
 
 	clock_init_usb(GCLK_SYSTEM);
 	init_systick();
 	nvm_init();
 
+	#ifndef TEST_RIG_BOOTLOADER
 	pin_low(PORT_A.power);
 	pin_out(PORT_A.power);
 
 	pin_low(PORT_B.power);
 	pin_out(PORT_B.power);
+	#endif
 
 	pin_out(PIN_LED);
 

boot/usb.c

@@ -23,8 +23,13 @@ const USB_DeviceDescriptor device_descriptor = {
 	.bDeviceProtocol        = USB_CSCP_NoDeviceProtocol,
 
 	.bMaxPacketSize0        = 64,
+#ifdef TEST_RIG_BOOTLOADER
+	.idVendor               = 0x59E3,
+	.idProduct              = 0xCDA7,
+#else
 	.idVendor               = 0x1209,
 	.idProduct              = 0x7551,
+#endif
 	.bcdDevice              = 0x0002,
 
 	.iManufacturer          = 0x01,

test_rig.mk

@@ -13,4 +13,4 @@ $(TARGET)_SRC += \
   test_rig/button.c \
 
 $(TARGET)_DEFINE += -D __SAMD21J18A__
-$(TARGET)_LDSCRIPT = deps/sam0/linker_scripts/samd21/gcc/samd21j18a_flash.ld
+$(TARGET)_LDSCRIPT = common/samd21g15a_firmware_partition.ld

test_rig/usb.c

@@ -8,6 +8,7 @@
 
 #define REQ_INFO 0x30
 #define REQ_INFO_GIT_HASH 0x0
+#define REQ_BOOT 0xBB
 
 USB_ENDPOINTS(5);
 
@@ -215,6 +216,12 @@ void req_info(uint16_t wIndex) {
     return usb_ep0_in(len);
 }
 
+void req_boot() {
+    wdt_reset(GCLK_32K);
+    usb_ep0_out();
+    return usb_ep0_in(0);
+}
+
 void usb_cb_control_setup(void) {
 	uint8_t recipient = usb_setup.bmRequestType & USB_REQTYPE_RECIPIENT_MASK;
 	if (recipient == USB_RECIPIENT_DEVICE) {
@@ -228,6 +235,7 @@ void usb_cb_control_setup(void) {
 				return usb_control_req_digital_read_all();
 			case ANALOG_SAMPLE:
 				return usb_control_req_analog_read(usb_setup.wIndex, usb_setup.wValue);
+			case REQ_BOOT: return req_boot();
 		}
 	} else if (recipient == USB_RECIPIENT_INTERFACE) {
 	}

test_rig_boot.mk

@@ -0,0 +1,16 @@
+TARGET := test_rig_boot
+
+include common.mk
+include usb.mk
+
+$(TARGET)_INCLUDE += \
+  -I boot \
+
+$(TARGET)_SRC += \
+  boot/main.c \
+  boot/usb.c \
+  $(USB_PATH)/class/dfu/dfu.c
+
+$(TARGET)_LDSCRIPT = deps/sam0/linker_scripts/samd21/gcc/samd21j18a_flash.ld
+$(TARGET)_DEFINE += -D __SAMD21J18A__
+$(TARGET)_DEFINE += -D TEST_RIG_BOOTLOADER