Merge remote-tracking branch 'adafruit/main' into adcdma

Author: dhalbert

main.c

@@ -967,15 +967,15 @@ int __attribute__((used)) main(void) {
         safe_mode = NO_CIRCUITPY;
     }
 
-    // displays init after filesystem, since they could share the flash SPI
-    board_init();
-
     // Reset everything and prep MicroPython to run boot.py.
     reset_port();
     // Port-independent devices, like CIRCUITPY_BLEIO_HCI.
     reset_devices();
     reset_board();
 
+    // displays init after filesystem, since they could share the flash SPI
+    board_init();
+
     // This is first time we are running CircuitPython after a reset or power-up.
     supervisor_set_run_reason(RUN_REASON_STARTUP);
 

ports/broadcom/boards/diodes_delight_piunora/mpconfigboard.h

@@ -4,3 +4,6 @@
 #define DEFAULT_I2C_BUS_SDA         (&pin_GPIO2)
 
 #define MICROPY_HW_NEOPIXEL         (&pin_GPIO12)
+
+#define CIRCUITPY_CONSOLE_UART_TX   (&pin_GPIO4)
+#define CIRCUITPY_CONSOLE_UART_RX   (&pin_GPIO5)

ports/broadcom/boards/raspberrypi_cm4io/mpconfigboard.h

@@ -4,3 +4,6 @@
 #define DEFAULT_I2C_BUS_SDA         (&pin_GPIO2)
 
 #define MICROPY_HW_LED_STATUS       (&pin_GPIO42)
+
+#define CIRCUITPY_CONSOLE_UART_TX   (&pin_GPIO14)
+#define CIRCUITPY_CONSOLE_UART_RX   (&pin_GPIO15)

ports/broadcom/boards/raspberrypi_pi4b/mpconfigboard.h

@@ -4,3 +4,6 @@
 #define DEFAULT_I2C_BUS_SDA         (&pin_GPIO2)
 
 #define MICROPY_HW_LED_STATUS       (&pin_GPIO42)
+
+#define CIRCUITPY_CONSOLE_UART_TX   (&pin_GPIO14)
+#define CIRCUITPY_CONSOLE_UART_RX   (&pin_GPIO15)

ports/broadcom/boards/raspberrypi_zero/mpconfigboard.h

@@ -4,3 +4,6 @@
 #define DEFAULT_I2C_BUS_SDA         (&pin_GPIO2)
 
 #define MICROPY_HW_LED_STATUS       (&pin_GPIO47)
+
+#define CIRCUITPY_CONSOLE_UART_TX   (&pin_GPIO14)
+#define CIRCUITPY_CONSOLE_UART_RX   (&pin_GPIO15)

ports/broadcom/boards/raspberrypi_zero2w/mpconfigboard.h

@@ -2,3 +2,8 @@
 
 #define DEFAULT_I2C_BUS_SCL         (&pin_GPIO3)
 #define DEFAULT_I2C_BUS_SDA         (&pin_GPIO2)
+
+#define MICROPY_HW_LED_STATUS       (&pin_GPIO29)
+
+#define CIRCUITPY_CONSOLE_UART_TX   (&pin_GPIO14)
+#define CIRCUITPY_CONSOLE_UART_RX   (&pin_GPIO15)

ports/broadcom/boards/raspberrypi_zero2w/pins.c

@@ -55,6 +55,7 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_GPIO25) },
     { MP_ROM_QSTR(MP_QSTR_D26), MP_ROM_PTR(&pin_GPIO26) },
     { MP_ROM_QSTR(MP_QSTR_D27), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO29) },
 
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
     { MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display)},

ports/broadcom/boards/raspberrypi_zero_w/mpconfigboard.h

@@ -4,3 +4,6 @@
 #define DEFAULT_I2C_BUS_SDA         (&pin_GPIO2)
 
 #define MICROPY_HW_LED_STATUS       (&pin_GPIO47)
+
+#define CIRCUITPY_CONSOLE_UART_TX   (&pin_GPIO14)
+#define CIRCUITPY_CONSOLE_UART_RX   (&pin_GPIO15)

ports/broadcom/mpconfigport.h

@@ -60,7 +60,4 @@
 #define MICROPY_PORT_ROOT_POINTERS \
     CIRCUITPY_COMMON_ROOT_POINTERS
 
-#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO14)
-#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO15)
-
 #endif  // __INCLUDED_MPCONFIGPORT_H

ports/espressif/boards/adafruit_esp32s2_camera/board.c

@@ -63,9 +63,6 @@ void board_init(void) {
         0, // Polarity
         0); // Phase
 
-    // workaround as board_init() is called before reset_port() in main.c
-    pwmout_reset();
-
     displayio_display_obj_t *display = &displays[0].display;
     display->base.type = &displayio_display_type;
     common_hal_displayio_display_construct(