Merge pull request #1508 from adafruit/tannewt-patch-8

Fix up board build

4 files changed, 9 insertions, 9 deletions

diff --git a/.travis.yml b/.travis.yml
index 1f47f7e9a..6a69dbcf4 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,10 +22,10 @@ git:
 # just try to make the builds "about equal in run time"
 env:
   - TRAVIS_TESTS="unix docs translations website" TRAVIS_BOARDS="circuitplayground_express mini_sam_m4 grandcentral_m4_express pca10056 pca10059 feather_nrf52840_express makerdiary_nrf52840_mdk makerdiary_nrf52840_mdk_usb_dongle particle_boron particle_argon particle_xenon sparkfun_nrf52840_mini" TRAVIS_SDK=arm:nrf
-  - TRAVIS_BOARDS="metro_m0_express metro_m4_express pirkey_m0 trellis_m4_express trinket_m0" TRAVIS_SDK=arm
+  - TRAVIS_BOARDS="metro_m0_express metro_m4_express pirkey_m0 trellis_m4_express trinket_m0 sparkfun_lumidrive sparkfun_redboard_turbo" TRAVIS_SDK=arm
   - TRAVIS_BOARDS="feather_radiofruit_zigbee gemma_m0 hallowing_m0_express itsybitsy_m0_express itsybitsy_m4_express meowmeow" TRAVIS_SDK=arm
   - TRAVIS_BOARDS="feather_m0_express_crickit feather_m0_rfm69 feather_m0_rfm9x feather_m4_express arduino_zero arduino_mkr1300 arduino_mkrzero" TRAVIS_SDK=arm
-  - TRAVIS_BOARDS="circuitplayground_express_crickit feather_m0_adalogger feather_m0_basic feather_m0_express catwan_usbstick pyportal sparkfun_samd21_mini sparkfun_samd21_dev sparkfun_lumidrive sparkfun_redboard_turbo" TRAVIS_SDK=arm
+  - TRAVIS_BOARDS="circuitplayground_express_crickit feather_m0_adalogger feather_m0_basic feather_m0_express catwan_usbstick pyportal sparkfun_samd21_mini sparkfun_samd21_dev" TRAVIS_SDK=arm
 
 addons:
   artifacts:
diff --git a/ports/atmel-samd/boards/sparkfun_lumidrive/mpconfigboard.h b/ports/atmel-samd/boards/sparkfun_lumidrive/mpconfigboard.h
index 7c7579f6c..6b470af2e 100755
--- a/ports/atmel-samd/boards/sparkfun_lumidrive/mpconfigboard.h
+++ b/ports/atmel-samd/boards/sparkfun_lumidrive/mpconfigboard.h
@@ -6,10 +6,10 @@
 // Clock rates are off: Salae reads 12MHz which is the limit even though we set it to the safer 8MHz.
 #define SPI_FLASH_BAUDRATE  (8000000)
 
-#define SPI_FLASH_MOSI_PIN   &PIN_PA08
-#define SPI_FLASH_MISO_PIN   &PIN_PA14
-#define SPI_FLASH_SCK_PIN    &PIN_PA09
-#define SPI_FLASH_CS_PIN     &PIN_PA13
+#define SPI_FLASH_MOSI_PIN   &pin_PA08
+#define SPI_FLASH_MISO_PIN   &pin_PA14
+#define SPI_FLASH_SCK_PIN    &pin_PA09
+#define SPI_FLASH_CS_PIN     &pin_PA13
 
 #define MICROPY_PORT_A    ( 0 )
 #define MICROPY_PORT_B    ( 0 )
diff --git a/ports/atmel-samd/boards/sparkfun_lumidrive/pins.c b/ports/atmel-samd/boards/sparkfun_lumidrive/pins.c
index 0af932e5b..232c89e38 100755
--- a/ports/atmel-samd/boards/sparkfun_lumidrive/pins.c
+++ b/ports/atmel-samd/boards/sparkfun_lumidrive/pins.c
@@ -1,6 +1,6 @@
 #include "shared-bindings/board/__init__.h"
 
-#include "board_busses.h"
+#include "supervisor/shared/board_busses.h"
 
 STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_PA04) },
diff --git a/ports/atmel-samd/boards/sparkfun_redboard_turbo/pins.c b/ports/atmel-samd/boards/sparkfun_redboard_turbo/pins.c
index ed284868b..223e20359 100755
--- a/ports/atmel-samd/boards/sparkfun_redboard_turbo/pins.c
+++ b/ports/atmel-samd/boards/sparkfun_redboard_turbo/pins.c
@@ -1,6 +1,6 @@
 #include "shared-bindings/board/__init__.h"
 
-#include "board_busses.h"
+#include "supervisor/shared/board_busses.h"
 
 STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) },
@@ -35,4 +35,4 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
     { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
 };
-MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);
\ No newline at end of file
+MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);