Merge branch 'master' into add-ure-et-al

dhalbert · dhalbert · commit 5c7071e92a41 · 2017-05-21T23:20:47.000-04:00
diff --git a/.travis.yml b/.travis.yml
@@ -41,7 +41,6 @@ script:
   - tools/build_adafruit_bins.sh
   - make -C minimal CROSS=1 build/firmware.bin
   - ls -l minimal/build/firmware.bin
-  - tools/check_code_size.sh
   - mkdir -p ${HOME}/persist
   # Save new firmware for reference, but only if building a main branch, not a pull request
   - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then cp minimal/build/firmware.bin ${HOME}/persist/; fi'
diff --git a/atmel-samd/main.c b/atmel-samd/main.c
@@ -576,6 +576,9 @@ int main(void) {
     reset_samd21();
     reset_mp();
 
+    // Turn on autoreload by default but before boot.py in case it wants to change it.
+    autoreload_enable();
+
     // If not in safe mode, run boot before initing USB and capture output in a
     // file.
     if (safe_mode == NO_SAFE_MODE) {
