Fix three boards and xtensa cache key

Author: tannewt

.github/workflows/build.yml

@@ -531,7 +531,7 @@ jobs:
       id: idf-cache
       with:
         path: ${{ github.workspace }}/.idf_tools
-        key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/esp32s2/esp-idf/HEAD') }}-20210506
+        key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/esp32s2/esp-idf/HEAD') }}-20210716
     - name: Clone IDF submodules
       run: |
         (cd $IDF_PATH && git submodule update --init)

ports/atmel-samd/boards/aloriumtech_evo_m51/board.c

@@ -30,6 +30,7 @@
 
 #include "supervisor/board.h"
 #include "mpconfigboard.h"
+#include "common-hal/microcontroller/Pin.h"
 
 void board_init(void) {
     never_reset_pin_number(PIN_PB20);

ports/atmel-samd/boards/trinket_m0_haxpress/mpconfigboard.h

@@ -3,8 +3,8 @@
 
 // Rev B - Black
 #define MICROPY_HW_LED_STATUS   (&pin_PA10)
-// #define MICROPY_HW_APA102_MOSI   (&pin_PA00)
-// #define MICROPY_HW_APA102_SCK    (&pin_PA01)
+#define MICROPY_HW_APA102_MOSI   (&pin_PA00)
+#define MICROPY_HW_APA102_SCK    (&pin_PA01)
 
 #define SPI_FLASH_MOSI_PIN          &pin_PA16
 #define SPI_FLASH_MISO_PIN          &pin_PA19

ports/atmel-samd/boards/uchip/board.c

@@ -25,7 +25,10 @@
  */
 
 #include "supervisor/board.h"
+
+#include "common-hal/microcontroller/Pin.h"
 #include "mpconfigboard.h"
+
 #include "hal/include/hal_gpio.h"
 
 void board_init(void) {
@@ -36,7 +39,7 @@ void board_init(void) {
     // USB_DETECT
     never_reset_pin_number(PIN_PA28);
     // USB_HOST_EN
-    never_reset_pin_number(PORT_PA27);
+    never_reset_pin_number(PIN_PA27);
 }
 
 bool board_requests_safe_mode(void) {